powerpc: Use probe_kernel_address in show_instructions

We really don't want to take a pagefault in show_instructions,
so use probe_kernel_address instead of __get_user.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 91e132b495bf7396072893400a75cadf011b9f60..8c2691e445bd4f9d8372829b5d14ab85db74b8b5 100644 (file)
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -37,9 +37,9 @@
 #include <linux/personality.h>
 #include <linux/random.h>
 #include <linux/hw_breakpoint.h>
+#include <linux/uaccess.h>
 
 #include <asm/pgtable.h>
-#include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
@@ -921,12 +921,8 @@ static void show_instructions(struct pt_regs *regs)
                        pc = (unsigned long)phys_to_virt(pc);
 #endif
 
-               /* We use __get_user here *only* to avoid an OOPS on a
-                * bad address because the pc *should* only be a
-                * kernel address.
-                */
                if (!__kernel_text_address(pc) ||
-                    __get_user(instr, (unsigned int __user *)pc)) {
+                    probe_kernel_address((unsigned int __user *)pc, instr)) {
                        printk(KERN_CONT "XXXXXXXX ");
                } else {
                        if (regs->nip == pc)