CommitterLinus Torvalds (1)
AuthorLinus Torvalds (1)
Branchesmaster (1)


Linux/linux fa1827d — arch/powerpc/include/asm btext.h kexec.h, arch/powerpc/include/asm/book3s/64 pgtable.h

by Linus Torvalds on ⎇
Merge tag 'powerpc-5.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fixes from Michael Ellerman:
 "One fix for a regression introduced by our 32-bit KASAN support, which
  broke booting on machines with "bootx" early debugging enabled.

  A fix for a bug which broke kexec on 32-bit, introduced by changes to
  the 32-bit STRICT_KERNEL_RWX support in v5.1.

  Finally two fixes going to stable for our THP split/collapse handling,
  discovered by Nick. The first fixes random crashes and/or corruption
  in guests under sufficient load.

  Thanks to: Nicholas Piggin, Christophe Leroy, Aaro Koskinen, Mathieu
  Malaterre"

* tag 'powerpc-5.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/32s: fix booting with CONFIG_PPC_EARLY_DEBUG_BOOTX
  powerpc/64s: __find_linux_pte() synchronization vs pmdp_invalidate()
  powerpc/64s: Fix THP PMD collapse serialisation
  powerpc: Fix kexec failure on book3s/32
DeltaFile
+30-0arch/powerpc/include/asm/book3s/64/pgtable.h
+14-2arch/powerpc/mm/pgtable.c
+3-1arch/powerpc/kernel/machine_kexec_32.c
+4-0arch/powerpc/include/asm/btext.h
+3-0arch/powerpc/include/asm/kexec.h
+3-0arch/powerpc/mm/book3s64/pgtable.c
+1-1arch/powerpc/kernel/prom_init_check.sh
+1-0arch/powerpc/kernel/prom_init.c
+59-48 files

UnifiedSplitRaw