From f9a524890af6592dfa8981b2a336f71c4bac0225 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Fri, 13 Oct 2006 12:17:16 +1000
Subject: [PATCH] --- yaml --- r: 39766 b: refs/heads/master c:
 00ae36de49cc718d4122e1c8aac96fd1a5a2553c h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/arch/powerpc/kernel/process.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 95ecd327a669..7eea716a2a85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99f48610252b736908fa5bdea505a480368308d6
+refs/heads/master: 00ae36de49cc718d4122e1c8aac96fd1a5a2553c
diff --git a/trunk/arch/powerpc/kernel/process.c b/trunk/arch/powerpc/kernel/process.c
index 7b2f6452ba72..f3d4dd580dd6 100644
--- a/trunk/arch/powerpc/kernel/process.c
+++ b/trunk/arch/powerpc/kernel/process.c
@@ -341,13 +341,6 @@ struct task_struct *__switch_to(struct task_struct *prev,
 
 static int instructions_to_print = 16;
 
-#ifdef CONFIG_PPC64
-#define BAD_PC(pc)	((REGION_ID(pc) != KERNEL_REGION_ID) && \
-		         (REGION_ID(pc) != VMALLOC_REGION_ID))
-#else
-#define BAD_PC(pc)	((pc) < KERNELBASE)
-#endif
-
 static void show_instructions(struct pt_regs *regs)
 {
 	int i;
@@ -366,7 +359,8 @@ static void show_instructions(struct pt_regs *regs)
 		 * bad address because the pc *should* only be a
 		 * kernel address.
 		 */
-		if (BAD_PC(pc) || __get_user(instr, (unsigned int __user *)pc)) {
+		if (!__kernel_text_address(pc) ||
+		     __get_user(instr, (unsigned int __user *)pc)) {
 			printk("XXXXXXXX ");
 		} else {
 			if (regs->nip == pc)