summaryrefslogtreecommitdiff
path: root/arch/x86/include
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2009-11-09 23:03:43 +0300
committerFrederic Weisbecker <fweisbec@gmail.com>2009-11-10 13:23:05 +0300
commit9f6b3c2c30cfbb1166ce7e74a8f9fd93ae19d2de (patch)
tree1144b1c516327765c7daacc6f4b23cc606a0c013 /arch/x86/include
parent676c0dbe6e514fdd8e434a9e623c781aa9b40b15 (diff)
downloadlinux-9f6b3c2c30cfbb1166ce7e74a8f9fd93ae19d2de.tar.xz
hw-breakpoints: Fix broken a.out format dump
Fix the broken a.out format dump. For now we only dump the ptrace breakpoints. TODO: Dump every perf breakpoints for the current thread, not only ptrace based ones. Reported-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: "K. Prasad" <prasad@linux.vnet.ibm.com>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/a.out-core.h10
-rw-r--r--arch/x86/include/asm/debugreg.h2
2 files changed, 4 insertions, 8 deletions
diff --git a/arch/x86/include/asm/a.out-core.h b/arch/x86/include/asm/a.out-core.h
index fc4685dd6e4d..7a15588e45d4 100644
--- a/arch/x86/include/asm/a.out-core.h
+++ b/arch/x86/include/asm/a.out-core.h
@@ -17,6 +17,7 @@
#include <linux/user.h>
#include <linux/elfcore.h>
+#include <asm/debugreg.h>
/*
* fill in the user structure for an a.out core dump
@@ -32,14 +33,7 @@ static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump)
>> PAGE_SHIFT;
dump->u_dsize -= dump->u_tsize;
dump->u_ssize = 0;
- dump->u_debugreg[0] = current->thread.debugreg[0];
- dump->u_debugreg[1] = current->thread.debugreg[1];
- dump->u_debugreg[2] = current->thread.debugreg[2];
- dump->u_debugreg[3] = current->thread.debugreg[3];
- dump->u_debugreg[4] = 0;
- dump->u_debugreg[5] = 0;
- dump->u_debugreg[6] = current->thread.debugreg6;
- dump->u_debugreg[7] = current->thread.debugreg7;
+ aout_dump_debugregs(dump);
if (dump->start_stack < TASK_SIZE)
dump->u_ssize = ((unsigned long)(TASK_SIZE - dump->start_stack))
diff --git a/arch/x86/include/asm/debugreg.h b/arch/x86/include/asm/debugreg.h
index 9a3333c91f9a..f1b673f08239 100644
--- a/arch/x86/include/asm/debugreg.h
+++ b/arch/x86/include/asm/debugreg.h
@@ -89,6 +89,8 @@ static inline void hw_breakpoint_disable(void)
set_debugreg(0UL, 3);
}
+extern void aout_dump_debugregs(struct user *dump);
+
#ifdef CONFIG_KVM
extern void hw_breakpoint_restore(void);
#endif