x86, ptrace: support 32bit-cross-64bit BTS recording

Support BTS recording of 32bit and 64bit tasks from 32bit or 64bit tasks.

Signed-off-by: Markus Metzger <markus.t.metzger@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2 files changed, 7 insertions, 7 deletions

diff --git a/include/asm-x86/ds.h b/include/asm-x86/ds.h
index b84040abee68..7881368142fa 100644
--- a/include/asm-x86/ds.h
+++ b/include/asm-x86/ds.h
@@ -39,16 +39,16 @@ enum bts_qualifier {
 };
 
 struct bts_struct {
-        enum bts_qualifier qualifier;
+        u64 qualifier;
         union {
                 /* BTS_BRANCH */
                 struct {
-                        long from_ip;
-                        long to_ip;
+                        u64 from_ip;
+                        u64 to_ip;
                 } lbr;
                 /* BTS_TASK_ARRIVES or
                    BTS_TASK_DEPARTS */
-                unsigned long jiffies;
+                u64 jiffies;
         } variant;
 };
 
@@ -64,7 +64,7 @@ extern int ds_get_bts_index(void *);
 extern int ds_set_overflow(void *, int);
 extern int ds_get_overflow(void *);
 extern int ds_clear(void *);
-extern int ds_read_bts(void *, size_t, struct bts_struct *);
+extern int ds_read_bts(void *, int, struct bts_struct *);
 extern int ds_write_bts(void *, const struct bts_struct *);
 extern unsigned long ds_debugctl_mask(void);
 extern void __cpuinit ds_init_intel(struct cpuinfo_x86 *c);
diff --git a/include/asm-x86/ptrace-abi.h b/include/asm-x86/ptrace-abi.h
index cf2fe4633ee5..32fe137822bf 100644
--- a/include/asm-x86/ptrace-abi.h
+++ b/include/asm-x86/ptrace-abi.h
@@ -85,9 +85,9 @@
 */
 struct ptrace_bts_config {
         /* requested or actual size of BTS buffer in bytes */
-        unsigned long size;
+        unsigned int size;
         /* bitmask of below flags */
-        unsigned long flags;
+        unsigned int flags;
 };
 
 #define PTRACE_BTS_O_TRACE      0x1 /* branch trace */