From: Andi Kleen <ak@suse.de>
Date: Wed, 30 Jan 2008 12:32:36 +0000 (+0100)
Subject: x86: make ptrace.h safe to include from assembler code
X-Git-Tag: v2.6.25-rc1~1143^2~429
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=27efeb67714608b28c0b213cceb6080749435c6b;p=linux-2.6-omap-h63xx.git

x86: make ptrace.h safe to include from assembler code

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/include/asm-x86/ptrace-abi.h b/include/asm-x86/ptrace-abi.h
index b3b9e023afc..08a12b790a7 100644
--- a/include/asm-x86/ptrace-abi.h
+++ b/include/asm-x86/ptrace-abi.h
@@ -80,6 +80,7 @@
 
 #define PTRACE_SINGLEBLOCK	33	/* resume execution until next branch */
 
+#ifndef __ASSEMBLY__
 /* configuration/status structure used in PTRACE_BTS_CONFIG and
    PTRACE_BTS_STATUS commands.
 */
@@ -91,6 +92,7 @@ struct ptrace_bts_config {
 	/* buffer overflow signal */
 	unsigned int signal;
 };
+#endif
 
 #define PTRACE_BTS_O_TRACE	0x1 /* branch trace */
 #define PTRACE_BTS_O_SCHED	0x2 /* scheduling events w/ jiffies */