5 files changed, 7 insertions, 14 deletions

diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h
index b415c0e85458..73192618f1c2 100644
--- a/arch/arm/include/asm/ptrace.h
+++ b/arch/arm/include/asm/ptrace.h
@@ -54,7 +54,6 @@
 #define PSR_C_BIT       0x20000000
 #define PSR_Z_BIT       0x40000000
 #define PSR_N_BIT       0x80000000
-#define PCMASK          0
 
 /*
  * Groups of PSR bits
@@ -139,11 +138,7 @@ static inline int valid_user_regs(struct pt_regs *regs)
         return 0;
 }
 
-#define pc_pointer(v) \
-        ((v) & ~PCMASK)
-
-#define instruction_pointer(regs) \
-        (pc_pointer((regs)->ARM_pc))
+#define instruction_pointer(regs)       (regs)->ARM_pc
 
 #ifdef CONFIG_SMP
 extern unsigned long profile_pc(struct pt_regs *regs);
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
index e56fa48e4ae7..68b9ec82a37f 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -98,7 +98,7 @@ static inline struct thread_info *current_thread_info(void)
 }
 
 #define thread_saved_pc(tsk)    \
-        ((unsigned long)(pc_pointer(task_thread_info(tsk)->cpu_context.pc)))
+        ((unsigned long)(task_thread_info(tsk)->cpu_context.pc))
 #define thread_saved_fp(tsk)    \
         ((unsigned long)(task_thread_info(tsk)->cpu_context.fp))
 
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index a2e75420858e..2ce9a401c8f2 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -385,7 +385,7 @@ unsigned long get_wchan(struct task_struct *p)
         do {
                 if (fp < stack_start || fp > stack_end)
                         return 0;
-                lr = pc_pointer (((unsigned long *)fp)[-1]);
+                lr = ((unsigned long *)fp)[-1];
                 if (!in_sched_functions(lr))
                         return lr;
                 fp = *(unsigned long *) (fp - 12);
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index 4b05dc5c1023..77ea1f27f406 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -126,7 +126,7 @@ ptrace_getrn(struct task_struct *child, unsigned long insn)
 
         val = get_user_reg(child, reg);
         if (reg == 15)
-                val = pc_pointer(val + 8);
+                val += 8;
 
         return val;
 }
@@ -278,8 +278,7 @@ get_branch_address(struct task_struct *child, unsigned long pc, unsigned long in
                                 else
                                         base -= aluop2;
                         }
-                        if (read_u32(child, base, &alt) == 0)
-                                alt = pc_pointer(alt);
+                        read_u32(child, base, &alt);
                 }
                 break;
 
@@ -305,8 +304,7 @@ get_branch_address(struct task_struct *child, unsigned long pc, unsigned long in
 
                         base = ptrace_getrn(child, insn);
 
-                        if (read_u32(child, base + nr_regs, &alt) == 0)
-                                alt = pc_pointer(alt);
+                        read_u32(child, base + nr_regs, &alt);
                         break;
                 }
                 break;
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index 368d171754cf..c68b44aa88d2 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -59,7 +59,7 @@ unsigned long profile_pc(struct pt_regs *regs)
 
         if (in_lock_functions(pc)) {
                 fp = regs->ARM_fp;
-                pc = pc_pointer(((unsigned long *)fp)[-1]);
+                pc = ((unsigned long *)fp)[-1];
         }
 
         return pc;