kernel/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch
Justin M. Forbes fa13b59d63 kernel-5.9.0-0.rc1.1
* Mon Aug 17 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc1.1]
- v5.9-rc1 rebase
- Config updates for Fedora ("Justin M. Forbes")
- fedora: enable enery model (Peter Robinson)
- iio: enable LTR-559 light and proximity sensor (Peter Robinson)
- iio: chemical: enable some popular chemical and partical sensors (Peter Robinson)
- More mismatches ("Justin M. Forbes")
- Fedora config change due to deps ("Justin M. Forbes")
- CONFIG_SND_SOC_MAX98390 is now selected by SND_SOC_INTEL_DA7219_MAX98357A_GENERIC ("Justin M. Forbes")
- Config change required for build part 2 ("Justin M. Forbes")
- Config change required for build ("Justin M. Forbes")
- Enable ARM_SMCCC_SOC_ID on all aarch64 kernels (Peter Robinson)
- Enable ZSTD compression algorithm on all kernels (Peter Robinson)
- Fedora config update ("Justin M. Forbes")
- Revert "Merge branch 'make_configs_fix' into 'os-build'" (Justin Forbes)
- Use the configs/generic config for SND_HDA_INTEL everywhere (Peter Robinson)
- redhat/configs/process_configs.sh: Remove *.config.orig files (Prarit Bhargava)
- redhat/configs/process_configs.sh: Add process_configs_known_broken flag (Prarit Bhargava)
- redhat/Makefile: Fix '*-configs' targets (Prarit Bhargava)
- Updated changelog for the release based on v5.8 (Fedora Kernel Team)
- Add ability to sync upstream through Makefile (Don Zickus)
- Add master merge check (Don Zickus)
- Replace hardcoded values 'os-build' and project id with variables (Don Zickus)
- gitattributes: Remove unnecesary export restrictions (Prarit Bhargava)
- redhat/Makefile.common: Fix MARKER (Prarit Bhargava)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2020-08-17 11:18:16 -05:00

81 lines
2.5 KiB
Diff

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
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 | 1 +
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Kconfig.redhat b/Kconfig.redhat
index 733a26bd887a..effb81d04bfd 100644
--- a/Kconfig.redhat
+++ b/Kconfig.redhat
@@ -5,7 +5,7 @@
menu "Red Hat options"
-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
index a1a012702915..b57e6dd6d7ef 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1371,7 +1371,7 @@ void __init setup_arch(char **cmdline_p)
efi_apply_memmap_quirks();
#endif
-#ifdef CONFIG_RH_DISABLE_DEPRECATED
+#ifdef CONFIG_RHEL_DIFFERENCES
rh_check_supported();
#endif
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index c93ba7fc65da..2803ec062a16 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -1057,7 +1057,7 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
struct module;
-#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
index 4fbfd2a0800c..a591962f7906 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -14,6 +14,7 @@ obj-y = fork.o exec_domain.o panic.o \
obj-$(CONFIG_BPFILTER) += usermode_driver.o
obj-$(CONFIG_RH_DISABLE_DEPRECATED) += rh_taint.o
+obj-$(CONFIG_RHEL_DIFFERENCES) += rh_taint.o
obj-$(CONFIG_MODULES) += kmod.o
obj-$(CONFIG_MULTIUSER) += groups.o
--
2.26.2