2020-05-08 14:52:40 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2020-04-23 20:47:21 +00:00
|
|
|
From: Don Zickus <dzickus@redhat.com>
|
|
|
|
|
Date: Tue, 3 Mar 2020 09:35:28 -0500
|
|
|
|
|
Subject: [PATCH] Rename RH_DISABLE_DEPRECATED to RHEL_DIFFERENCES
|
|
|
|
|
|
|
|
|
|
The intent of RH_DISABLE_DEPRECATED was to provide Red Hat a
|
|
|
|
|
simple way to disable drivers it did not want to support in RHEL.
|
|
|
|
|
|
|
|
|
|
As the config option was applied to more drivers and infra, it became
|
|
|
|
|
clear the option was being used for not only deprecating drivers (which
|
|
|
|
|
implied limited support) to disabling drivers (implying no support).
|
|
|
|
|
|
|
|
|
|
Using the word 'deprecated' seemed confusing in the second scenario.
|
|
|
|
|
Rename the option to be more generic and useable across more parts
|
|
|
|
|
of the kernel tree.
|
|
|
|
|
|
|
|
|
|
The new wording is RHEL_DIFFERENCES.
|
|
|
|
|
|
|
|
|
|
Upstream Status: RHEL only
|
|
|
|
|
---
|
|
|
|
|
Kconfig.redhat | 2 +-
|
|
|
|
|
arch/x86/kernel/setup.c | 2 +-
|
|
|
|
|
include/linux/kernel.h | 2 +-
|
|
|
|
|
kernel/Makefile | 2 +-
|
|
|
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/Kconfig.redhat b/Kconfig.redhat
|
|
|
|
|
index 733a26bd887a..effb81d04bfd 100644
|
|
|
|
|
--- a/Kconfig.redhat
|
|
|
|
|
+++ b/Kconfig.redhat
|
|
|
|
|
@@ -5,7 +5,7 @@
|
2020-06-30 14:24:22 +00:00
|
|
|
|
2020-04-23 20:47:21 +00:00
|
|
|
menu "Red Hat options"
|
2020-06-30 14:24:22 +00:00
|
|
|
|
2020-04-23 20:47:21 +00:00
|
|
|
-config RH_DISABLE_DEPRECATED
|
|
|
|
|
+config RHEL_DIFFERENCES
|
|
|
|
|
bool "Remove support for deprecated features"
|
|
|
|
|
help
|
|
|
|
|
Red Hat may choose to deprecate certain features in its kernels.
|
|
|
|
|
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
|
2020-06-02 18:57:57 +00:00
|
|
|
index 19d57bfc12f9..e677bb144835 100644
|
2020-04-23 20:47:21 +00:00
|
|
|
--- a/arch/x86/kernel/setup.c
|
|
|
|
|
+++ b/arch/x86/kernel/setup.c
|
2020-06-02 18:57:57 +00:00
|
|
|
@@ -1372,7 +1372,7 @@ void __init setup_arch(char **cmdline_p)
|
2020-04-23 20:47:21 +00:00
|
|
|
efi_apply_memmap_quirks();
|
|
|
|
|
#endif
|
2020-06-30 14:24:22 +00:00
|
|
|
|
2020-04-23 20:47:21 +00:00
|
|
|
-#ifdef CONFIG_RH_DISABLE_DEPRECATED
|
|
|
|
|
+#ifdef CONFIG_RHEL_DIFFERENCES
|
|
|
|
|
rh_check_supported();
|
|
|
|
|
#endif
|
2020-06-30 14:24:22 +00:00
|
|
|
|
2020-04-23 20:47:21 +00:00
|
|
|
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
|
2020-06-10 22:01:45 +00:00
|
|
|
index 0a0081b10edb..cfaaa6a234d4 100644
|
2020-04-23 20:47:21 +00:00
|
|
|
--- a/include/linux/kernel.h
|
|
|
|
|
+++ b/include/linux/kernel.h
|
2020-06-10 22:01:45 +00:00
|
|
|
@@ -1058,7 +1058,7 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
|
2020-06-30 14:24:22 +00:00
|
|
|
|
2020-04-23 20:47:21 +00:00
|
|
|
struct module;
|
2020-06-30 14:24:22 +00:00
|
|
|
|
2020-04-23 20:47:21 +00:00
|
|
|
-#ifdef CONFIG_RH_DISABLE_DEPRECATED
|
|
|
|
|
+#ifdef CONFIG_RHEL_DIFFERENCES
|
|
|
|
|
void mark_hardware_unsupported(const char *msg);
|
|
|
|
|
void mark_hardware_deprecated(const char *msg);
|
|
|
|
|
void mark_tech_preview(const char *msg, struct module *mod);
|
|
|
|
|
diff --git a/kernel/Makefile b/kernel/Makefile
|
2020-06-14 23:10:41 +00:00
|
|
|
index c0a4904413b5..1a0c362cddfb 100644
|
2020-04-23 20:47:21 +00:00
|
|
|
--- a/kernel/Makefile
|
|
|
|
|
+++ b/kernel/Makefile
|
|
|
|
|
@@ -12,7 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \
|
|
|
|
|
notifier.o ksysfs.o cred.o reboot.o \
|
|
|
|
|
async.o range.o smpboot.o ucount.o
|
2020-06-30 14:24:22 +00:00
|
|
|
|
2020-04-23 20:47:21 +00:00
|
|
|
-obj-$(CONFIG_RH_DISABLE_DEPRECATED) += rh_taint.o
|
|
|
|
|
+obj-$(CONFIG_RHEL_DIFFERENCES) += rh_taint.o
|
2020-06-30 14:24:22 +00:00
|
|
|
|
2020-04-23 20:47:21 +00:00
|
|
|
obj-$(CONFIG_MODULES) += kmod.o
|
|
|
|
|
obj-$(CONFIG_MULTIUSER) += groups.o
|
|
|
|
|
--
|
2020-06-30 14:24:22 +00:00
|
|
|
2.26.2
|
2020-04-23 20:47:21 +00:00
|
|
|
|
