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 a82bb3af81e5..dc6f9705db6e 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1341,7 +1341,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 11637989f373..b2ad8b56dc3c 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -533,7 +533,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 dd18b2c2cc2f..4d57c92c314a 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -13,6 +13,7 @@ obj-y = fork.o exec_domain.o panic.o \ async.o range.o smpboot.o ucount.o regset.o obj-$(CONFIG_RH_DISABLE_DEPRECATED) += rh_taint.o +obj-$(CONFIG_RHEL_DIFFERENCES) += rh_taint.o obj-$(CONFIG_USERMODE_DRIVER) += usermode_driver.o obj-$(CONFIG_MODULES) += kmod.o obj-$(CONFIG_MULTIUSER) += groups.o