Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c
index a3401b46f3ba..659a021da0c7 100644
--- a/arch/powerpc/oprofile/op_model_power4.c
+++ b/arch/powerpc/oprofile/op_model_power4.c
@@ -252,7 +252,7 @@ static unsigned long get_pc(struct pt_regs *regs)
                 return (unsigned long)__va(pc);
 
         /* Not sure where we were */
-        if (pc < KERNELBASE)
+        if (!is_kernel_addr(pc))
                 /* function descriptor madness */
                 return *((unsigned long *)kernel_unknown_bucket);
 
@@ -264,7 +264,7 @@ static int get_kernel(unsigned long pc)
         int is_kernel;
 
         if (!mmcra_has_sihv) {
-                is_kernel = (pc >= KERNELBASE);
+                is_kernel = is_kernel_addr(pc);
         } else {
                 unsigned long mmcra = mfspr(SPRN_MMCRA);
                 is_kernel = ((mmcra & MMCRA_SIPR) == 0);