From 9eebbf3ea2c26d522772d70d9ed428c422ecf6cc Mon Sep 17 00:00:00 2001
From: Markus Metzger <markus.t.metzger@intel.com>
Date: Tue, 24 Feb 2009 14:12:34 +0100
Subject: [PATCH] --- yaml --- r: 140798 b: refs/heads/master c:
 499aa86dcbc3c4daf7d2c59c5c30e1a78220fbc1 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/x86/include/asm/ptrace-abi.h | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1c54ca45ac25..f54dfe528ac5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e01cb695d29619dd551bac7d6aa4ef1dc8ebc95
+refs/heads/master: 499aa86dcbc3c4daf7d2c59c5c30e1a78220fbc1
diff --git a/trunk/arch/x86/include/asm/ptrace-abi.h b/trunk/arch/x86/include/asm/ptrace-abi.h
index 8e0f8d199e05..86723035a515 100644
--- a/trunk/arch/x86/include/asm/ptrace-abi.h
+++ b/trunk/arch/x86/include/asm/ptrace-abi.h
@@ -80,8 +80,6 @@
 
 #define PTRACE_SINGLEBLOCK	33	/* resume execution until next branch */
 
-#ifdef CONFIG_X86_PTRACE_BTS
-
 #ifndef __ASSEMBLY__
 #include <linux/types.h>
 
@@ -140,6 +138,5 @@ struct ptrace_bts_config {
    BTS records are read from oldest to newest.
    Returns number of BTS records drained.
 */
-#endif /* CONFIG_X86_PTRACE_BTS */
 
 #endif /* _ASM_X86_PTRACE_ABI_H */