2 files changed, 2 insertions, 6 deletions

diff --git a/arch/arm/include/asm/a.out-core.h b/arch/arm/include/asm/a.out-core.h
index 93d04acaa31f..92f10cb5c70c 100644
--- a/arch/arm/include/asm/a.out-core.h
+++ b/arch/arm/include/asm/a.out-core.h
@@ -32,11 +32,7 @@ static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump)
         dump->u_dsize = (tsk->mm->brk - tsk->mm->start_data + PAGE_SIZE - 1) >> PAGE_SHIFT;
         dump->u_ssize = 0;
 
-        dump->u_debugreg[0] = tsk->thread.debug.bp[0].address;
-        dump->u_debugreg[1] = tsk->thread.debug.bp[1].address;
-        dump->u_debugreg[2] = tsk->thread.debug.bp[0].insn.arm;
-        dump->u_debugreg[3] = tsk->thread.debug.bp[1].insn.arm;
-        dump->u_debugreg[4] = tsk->thread.debug.nsaved;
+        memset(dump->u_debugreg, 0, sizeof(dump->u_debugreg));
 
         if (dump->start_stack < 0x04000000)
                 dump->u_ssize = (0x04000000 - dump->start_stack) >> PAGE_SHIFT;
diff --git a/arch/arm/include/asm/user.h b/arch/arm/include/asm/user.h
index 05ac4b06876a..35917b3a97f9 100644
--- a/arch/arm/include/asm/user.h
+++ b/arch/arm/include/asm/user.h
@@ -71,7 +71,7 @@ struct user{
                                 /* the registers. */
   unsigned long magic;          /* To uniquely identify a core file */
   char u_comm[32];              /* User command that was responsible */
-  int u_debugreg[8];
+  int u_debugreg[8];            /* No longer used */
   struct user_fp u_fp;          /* FP state */
   struct user_fp_struct * u_fp0;/* Used by gdb to help find the values for */
                                 /* the FP registers. */