From c60b382a36f141d6c1f49f3ebe45a357a8c73e3a Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 31 Mar 2022 09:32:52 -0500 Subject: kernel-5.18.0-0.rc0.787af64d05cd.12 * Thu Mar 31 2022 Fedora Kernel Team [5.18.0-0.rc0.787af64d05cd.12] - redhat/kernel.spec.template: Fix intel-speed-select compile (Prarit Bhargava) - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- patch-5.18-redhat.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'patch-5.18-redhat.patch') diff --git a/patch-5.18-redhat.patch b/patch-5.18-redhat.patch index 29c98aac8..5eda5519d 100644 --- a/patch-5.18-redhat.patch +++ b/patch-5.18-redhat.patch @@ -2261,7 +2261,7 @@ index 419b5febc3ca..491323dfe4e0 100644 * * @perf_event_open: diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h -index 962b14d403e8..95ecd06fd858 100644 +index 962b14d403e8..8a89efe47571 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1398,11 +1398,9 @@ static inline unsigned long *section_to_usemap(struct mem_section *ms) @@ -2269,7 +2269,7 @@ index 962b14d403e8..95ecd06fd858 100644 { #ifdef CONFIG_SPARSEMEM_EXTREME - if (!mem_section) -+ if (!*mem_section || !mem_section[SECTION_NR_TO_ROOT(nr)]) ++ if (!mem_section || !mem_section[SECTION_NR_TO_ROOT(nr)]) return NULL; #endif - if (!mem_section[SECTION_NR_TO_ROOT(nr)]) -- cgit