diff options
Diffstat (limited to '0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch')
| -rw-r--r-- | 0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch b/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch index dd77c307a..3918158a9 100644 --- a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch +++ b/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch @@ -21,8 +21,8 @@ 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(-) + kernel/Makefile | 1 + + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Kconfig.redhat b/Kconfig.redhat index 733a26bd887a..effb81d04bfd 100644 @@ -38,10 +38,10 @@ index 733a26bd887a..effb81d04bfd 100644 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 19d57bfc12f9..e677bb144835 100644 +index a1a012702915..b57e6dd6d7ef 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -1372,7 +1372,7 @@ void __init setup_arch(char **cmdline_p) +@@ -1371,7 +1371,7 @@ void __init setup_arch(char **cmdline_p) efi_apply_memmap_quirks(); #endif @@ -51,10 +51,10 @@ index 19d57bfc12f9..e677bb144835 100644 #endif diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index 0a0081b10edb..cfaaa6a234d4 100644 +index c93ba7fc65da..2803ec062a16 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -1058,7 +1058,7 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } +@@ -1057,7 +1057,7 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } struct module; @@ -64,18 +64,17 @@ index 0a0081b10edb..cfaaa6a234d4 100644 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 c0a4904413b5..1a0c362cddfb 100644 +index 931e726455f4..362464775992 100644 --- 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 +@@ -14,6 +14,7 @@ obj-y = fork.o exec_domain.o panic.o \ --obj-$(CONFIG_RH_DISABLE_DEPRECATED) += rh_taint.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 |