Merge branch 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm

[linux-2.6-omap-h63xx.git] / include / asm-x86 / ptrace-abi.h

diff --git a/include/asm-x86/ptrace-abi.h b/include/asm-x86/ptrace-abi.h
index b3b9e023afce7851a268fe29b1efca3dc39f7e3b..81a8ee4c55fc50a941373d5c16de01da455bdee7 100644 (file)
--- a/include/asm-x86/ptrace-abi.h
+++ b/include/asm-x86/ptrace-abi.h
@@ -80,17 +80,24 @@
 
 #define PTRACE_SINGLEBLOCK     33      /* resume execution until next branch */
 
+#ifndef __ASSEMBLY__
+
+#include <asm/types.h>
+
 /* configuration/status structure used in PTRACE_BTS_CONFIG and
    PTRACE_BTS_STATUS commands.
 */
 struct ptrace_bts_config {
        /* requested or actual size of BTS buffer in bytes */
-       unsigned int size;
+       u32 size;
        /* bitmask of below flags */
-       unsigned int flags;
+       u32 flags;
        /* buffer overflow signal */
-       unsigned int signal;
+       u32 signal;
+       /* actual size of bts_struct in bytes */
+       u32 bts_size;
 };
+#endif
 
 #define PTRACE_BTS_O_TRACE     0x1 /* branch trace */
 #define PTRACE_BTS_O_SCHED     0x2 /* scheduling events w/ jiffies */