From f7a55ba381de17d8e5511a97441944b797aa62a5 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 7 Oct 2020 09:54:44 -0500 Subject: kernel-5.9.0-0.rc8.20201007git7575fdda569b.29 * Wed Oct 07 2020 Fedora Kernel Team [5.9.0-0.rc8.20201007git7575fdda569b.29] - Merge ark-patches Resolves: rhbz# Signed-off-by: Justin M. Forbes --- 0001-add-Red-Hat-specific-taint-flags.patch | 83 ----------------------------- 1 file changed, 83 deletions(-) delete mode 100644 0001-add-Red-Hat-specific-taint-flags.patch (limited to '0001-add-Red-Hat-specific-taint-flags.patch') diff --git a/0001-add-Red-Hat-specific-taint-flags.patch b/0001-add-Red-Hat-specific-taint-flags.patch deleted file mode 100644 index 8179d8390..000000000 --- a/0001-add-Red-Hat-specific-taint-flags.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Eugene Syromiatnikov -Date: Thu, 14 Jun 2018 16:35:59 -0400 -Subject: [PATCH] add Red Hat-specific taint flags - -Message-id: <56f71e5f8cf63afd0cdb1c4550c625cc90d59a75.1528991395.git.esyr@redhat.com> -Patchwork-id: 8249 -O-Subject: [kernel team] [RHEL8 PATCH v4 1/5] kernel: add Red Hat-specific taint flags -Bugzilla: 1559877 -RH-Acked-by: Jiri Benc -RH-Acked-by: Jesper Dangaard Brouer - -Based on RHEL 7 commit "Backport RH specific TAINT flags" by Prarit -Bhargava. - -Upstream Status: RHEL only -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1559877 -Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=16716594 -Signed-off-by: Eugene Syromiatnikov -Signed-off-by: Herton R. Krzesinski ---- - include/linux/kernel.h | 19 ++++++++++++++++++- - kernel/panic.c | 14 ++++++++++++++ - 2 files changed, 32 insertions(+), 1 deletion(-) - -diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index 19291af895eb..ae2859863d59 100644 ---- a/include/linux/kernel.h -+++ b/include/linux/kernel.h -@@ -604,7 +604,24 @@ extern enum system_states { - #define TAINT_LIVEPATCH 15 - #define TAINT_AUX 16 - #define TAINT_RANDSTRUCT 17 --#define TAINT_FLAGS_COUNT 18 -+/* Start of Red Hat-specific taint flags */ -+#define TAINT_18 18 -+#define TAINT_19 19 -+#define TAINT_20 20 -+#define TAINT_21 21 -+#define TAINT_22 22 -+#define TAINT_23 23 -+#define TAINT_24 24 -+#define TAINT_25 25 -+#define TAINT_26 26 -+#define TAINT_27 27 -+/* Bits 28 - 31 are reserved for Red Hat use only */ -+#define TAINT_RESERVED28 28 -+#define TAINT_RESERVED29 29 -+#define TAINT_RESERVED30 30 -+#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 { -diff --git a/kernel/panic.c b/kernel/panic.c -index e2157ca387c8..534bc76e43da 100644 ---- a/kernel/panic.c -+++ b/kernel/panic.c -@@ -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 }, -+ [ TAINT_18 ] = { '?', '-', false }, -+ [ TAINT_19 ] = { '?', '-', false }, -+ [ TAINT_20 ] = { '?', '-', false }, -+ [ TAINT_21 ] = { '?', '-', false }, -+ [ TAINT_22 ] = { '?', '-', false }, -+ [ TAINT_23 ] = { '?', '-', false }, -+ [ TAINT_24 ] = { '?', '-', false }, -+ [ TAINT_25 ] = { '?', '-', false }, -+ [ TAINT_26 ] = { '?', '-', false }, -+ [ TAINT_27 ] = { '?', '-', false }, -+ [ TAINT_RESERVED28 ] = { '?', '-', false }, -+ [ TAINT_RESERVED29 ] = { '?', '-', false }, -+ [ TAINT_RESERVED30 ] = { '?', '-', false }, -+ [ TAINT_RESERVED31 ] = { '?', '-', false }, - }; - - /** --- -2.28.0 - -- cgit