summaryrefslogtreecommitdiffstats
path: root/patch-5.18-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-03-31 09:32:52 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-03-31 09:32:52 -0500
commitc60b382a36f141d6c1f49f3ebe45a357a8c73e3a (patch)
tree9b0c57f10ea79e6f0d865cf407a30b0e4861653e /patch-5.18-redhat.patch
parentf4edc7212efcb05898c8fafa9dfe60698ded270f (diff)
downloadkernel-c60b382a36f141d6c1f49f3ebe45a357a8c73e3a.tar.gz
kernel-c60b382a36f141d6c1f49f3ebe45a357a8c73e3a.tar.xz
kernel-c60b382a36f141d6c1f49f3ebe45a357a8c73e3a.zip
kernel-5.18.0-0.rc0.787af64d05cd.12
* Thu Mar 31 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [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 <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.18-redhat.patch')
-rw-r--r--patch-5.18-redhat.patch4
1 files changed, 2 insertions, 2 deletions
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)])