From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 21 Jun 2020 17:02:53 +0000 (-0700)
Subject: Merge tag 'powerpc-5.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc... 
X-Git-Tag: Ubuntu-5.10.0-12.13~2539
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=75613939084f59c0848b146e54ba463dc494c433;p=mirror_ubuntu-hirsute-kernel.git

Merge tag 'powerpc-5.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fixes from Michael Ellerman:

 - One fix for the interrupt rework we did last release which broke
   KVM-PR

 - Three commits fixing some fallout from the READ_ONCE() changes
   interacting badly with our 8xx 16K pages support, which uses a pte_t
   that is a structure of 4 actual PTEs

 - A cleanup of the 8xx pte_update() to use the newly added pmd_off()

 - A fix for a crash when handling an oops if CONFIG_DEBUG_VIRTUAL is
   enabled

 - A minor fix for the SPU syscall generation

Thanks to Aneesh Kumar K.V, Christian Zigotzky, Christophe Leroy, Mike
Rapoport, Nicholas Piggin.

* tag 'powerpc-5.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/8xx: Provide ptep_get() with 16k pages
  mm: Allow arches to provide ptep_get()
  mm/gup: Use huge_ptep_get() in gup_hugepte()
  powerpc/syscalls: Use the number when building SPU syscall table
  powerpc/8xx: use pmd_off() to access a PMD entry in pte_update()
  powerpc/64s: Fix KVM interrupt using wrong save area
  powerpc: Fix kernel crash in show_instructions() w/DEBUG_VIRTUAL
---

75613939084f59c0848b146e54ba463dc494c433
diff --cc arch/powerpc/kernel/process.c
index 30955a0c32d0,a2f1f0e70a4b..4650b9bb217f
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@@ -1262,19 -1272,11 +1272,11 @@@ static void show_instructions(struct pt
  		if (!(i % 8))
  			pr_cont("\n");
  
- #if !defined(CONFIG_BOOKE)
- 		/* If executing with the IMMU off, adjust pc rather
- 		 * than print XXXXXXXX.
- 		 */
- 		if (!(regs->msr & MSR_IR))
- 			pc = (unsigned long)phys_to_virt(pc);
- #endif
- 
  		if (!__kernel_text_address(pc) ||
 -		    probe_kernel_address((const void *)pc, instr)) {
 +		    get_kernel_nofault(instr, (const void *)pc)) {
  			pr_cont("XXXXXXXX ");
  		} else {
- 			if (regs->nip == pc)
+ 			if (nip == pc)
  				pr_cont("<%08x> ", instr);
  			else
  				pr_cont("%08x ", instr);