tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 fixes from Catalin Marinas:

- kasan: avoid pfn_to_nid() before the page array is initialised

- Fix typo causing the "upgrade" of known signals to SIGKILL

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: signal: don't force known signals to SIGKILL
arm64: kasan: avoid pfn_to_nid() before page array is initialized

Linus Torvalds 9409227a 7a752478

+3 -3
+1 -1
arch/arm64/kernel/traps.c
··· 366 366 } 367 367 368 368 /* Force signals we don't understand to SIGKILL */ 369 - if (WARN_ON(signal != SIGKILL || 369 + if (WARN_ON(signal != SIGKILL && 370 370 siginfo_layout(signal, code) != SIL_FAULT)) { 371 371 signal = SIGKILL; 372 372 }
+2 -2
arch/arm64/mm/kasan_init.c
··· 204 204 clear_pgds(KASAN_SHADOW_START, KASAN_SHADOW_END); 205 205 206 206 kasan_map_populate(kimg_shadow_start, kimg_shadow_end, 207 - pfn_to_nid(virt_to_pfn(lm_alias(_text)))); 207 + early_pfn_to_nid(virt_to_pfn(lm_alias(_text)))); 208 208 209 209 kasan_populate_zero_shadow((void *)KASAN_SHADOW_START, 210 210 (void *)mod_shadow_start); ··· 224 224 225 225 kasan_map_populate((unsigned long)kasan_mem_to_shadow(start), 226 226 (unsigned long)kasan_mem_to_shadow(end), 227 - pfn_to_nid(virt_to_pfn(start))); 227 + early_pfn_to_nid(virt_to_pfn(start))); 228 228 } 229 229 230 230 /*