diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-11 05:54:53 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-11 05:54:53 +0200 |
commit | 168917328214e94a54dbd4ef227dab46029b8134 (patch) | |
tree | 9f5fbf0580f00cf39b1b0cfe1dacc387499e999f /0001-add-Red-Hat-specific-taint-flags.patch | |
parent | 38d5c149cae32d286308f7962e1d561e7939072f (diff) | |
parent | 8ae1eddbf56e902877016abbadb2150afe87711c (diff) | |
download | kernel-168917328214e94a54dbd4ef227dab46029b8134.tar.gz kernel-168917328214e94a54dbd4ef227dab46029b8134.tar.xz kernel-168917328214e94a54dbd4ef227dab46029b8134.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc31
Diffstat (limited to '0001-add-Red-Hat-specific-taint-flags.patch')
-rw-r--r-- | 0001-add-Red-Hat-specific-taint-flags.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/0001-add-Red-Hat-specific-taint-flags.patch b/0001-add-Red-Hat-specific-taint-flags.patch index 8f364f03e..a45526812 100644 --- a/0001-add-Red-Hat-specific-taint-flags.patch +++ b/0001-add-Red-Hat-specific-taint-flags.patch @@ -24,10 +24,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com> 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index 2cb1c4fea0c9..c041d4e950f4 100644 +index b82db0c0caec..28be75396242 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -595,7 +595,24 @@ extern enum system_states { +@@ -603,7 +603,24 @@ extern enum system_states { #define TAINT_LIVEPATCH 15 #define TAINT_AUX 16 #define TAINT_RANDSTRUCT 17 @@ -50,14 +50,14 @@ index 2cb1c4fea0c9..c041d4e950f4 100644 +#define TAINT_RESERVED31 31 +/* End of Red Hat-specific taint flags */ +#define TAINT_FLAGS_COUNT 32 + #define TAINT_FLAGS_MAX ((1UL << TAINT_FLAGS_COUNT) - 1) struct taint_flag { - char c_true; /* character printed when tainted */ diff --git a/kernel/panic.c b/kernel/panic.c -index b69ee9e76cb2..02f9b2c36cc1 100644 +index 85568bbfb12b..087392cd7dc8 100644 --- a/kernel/panic.c +++ b/kernel/panic.c -@@ -376,6 +376,20 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { +@@ -386,6 +386,20 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { [ TAINT_LIVEPATCH ] = { 'K', ' ', true }, [ TAINT_AUX ] = { 'X', ' ', true }, [ TAINT_RANDSTRUCT ] = { 'T', ' ', true }, |