Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[mv-sheeva.git] / include / asm-x86 / ptrace-abi.h

diff --git a/include/asm-x86/ptrace-abi.h b/include/asm-x86/ptrace-abi.h
index 08a12b790a7799c77ffe10c2c340713f161610ce..81a8ee4c55fc50a941373d5c16de01da455bdee7 100644 (file)
--- a/include/asm-x86/ptrace-abi.h
+++ b/include/asm-x86/ptrace-abi.h
@@ -81,16 +81,21 @@
 #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