diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-31 17:29:31 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-31 17:29:31 +0200 |
| commit | c4b406e4b845c14839146c32fbf7a8dec230874a (patch) | |
| tree | c5520e66eacd5b89d037bf42c99f4787fc25aa23 /patch-5.18-redhat.patch | |
| parent | 2f42ee8bccfa314c05f9d4138578470b579b2937 (diff) | |
| parent | c60b382a36f141d6c1f49f3ebe45a357a8c73e3a (diff) | |
| download | kernel-c4b406e4b845c14839146c32fbf7a8dec230874a.tar.gz kernel-c4b406e4b845c14839146c32fbf7a8dec230874a.tar.xz kernel-c4b406e4b845c14839146c32fbf7a8dec230874a.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'patch-5.18-redhat.patch')
| -rw-r--r-- | patch-5.18-redhat.patch | 4 |
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)]) |