3 files changed, 65 insertions, 2 deletions

diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index 83226e0a7ce4..aa3fa4119424 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -5,6 +5,7 @@
 obj-$(CONFIG_SMP) := msr-on-cpu.o
 
 lib-y := delay.o
+lib-y += thunk_$(BITS).o
 lib-y += usercopy_$(BITS).o getuser.o putuser.o
 lib-y += memcpy_$(BITS).o
 
diff --git a/arch/x86/lib/thunk_32.S b/arch/x86/lib/thunk_32.S
new file mode 100644
index 000000000000..650b11e00ecc
--- /dev/null
+++ b/arch/x86/lib/thunk_32.S
@@ -0,0 +1,47 @@
+/*
+ * Trampoline to trace irqs off. (otherwise CALLER_ADDR1 might crash)
+ * Copyright 2008 by Steven Rostedt, Red Hat, Inc
+ *  (inspired by Andi Kleen's thunk_64.S)
+ * Subject to the GNU public license, v.2. No warranty of any kind.
+ */
+
+        #include <linux/linkage.h>
+
+#define ARCH_TRACE_IRQS_ON                      \
+        pushl %eax;                             \
+        pushl %ecx;                             \
+        pushl %edx;                             \
+        call trace_hardirqs_on;                 \
+        popl %edx;                              \
+        popl %ecx;                              \
+        popl %eax;
+
+#define ARCH_TRACE_IRQS_OFF                     \
+        pushl %eax;                             \
+        pushl %ecx;                             \
+        pushl %edx;                             \
+        call trace_hardirqs_off;                \
+        popl %edx;                              \
+        popl %ecx;                              \
+        popl %eax;
+
+#ifdef CONFIG_TRACE_IRQFLAGS
+        /* put return address in eax (arg1) */
+        .macro thunk_ra name,func
+        .globl \name
+\name:
+        pushl %eax
+        pushl %ecx
+        pushl %edx
+        /* Place EIP in the arg1 */
+        movl 3*4(%esp), %eax
+        call \func
+        popl %edx
+        popl %ecx
+        popl %eax
+        ret
+        .endm
+
+        thunk_ra trace_hardirqs_on_thunk,trace_hardirqs_on_caller
+        thunk_ra trace_hardirqs_off_thunk,trace_hardirqs_off_caller
+#endif
diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
index e009251d4e9f..bf9a7d5a5428 100644
--- a/arch/x86/lib/thunk_64.S
+++ b/arch/x86/lib/thunk_64.S
@@ -2,6 +2,7 @@
  * Save registers before calling assembly functions. This avoids
  * disturbance of register allocation in some inline assembly constructs.
  * Copyright 2001,2002 by Andi Kleen, SuSE Labs.
+ * Added trace_hardirqs callers - Copyright 2007 Steven Rostedt, Red Hat, Inc.
  * Subject to the GNU public license, v.2. No warranty of any kind.
  */
 
@@ -42,8 +43,22 @@
 #endif  
         
 #ifdef CONFIG_TRACE_IRQFLAGS
-        thunk trace_hardirqs_on_thunk,trace_hardirqs_on
-        thunk trace_hardirqs_off_thunk,trace_hardirqs_off
+        /* put return address in rdi (arg1) */
+        .macro thunk_ra name,func
+        .globl \name
+\name:
+        CFI_STARTPROC
+        SAVE_ARGS
+        /* SAVE_ARGS pushs 9 elements */
+        /* the next element would be the rip */
+        movq 9*8(%rsp), %rdi
+        call \func
+        jmp  restore
+        CFI_ENDPROC
+        .endm
+
+        thunk_ra trace_hardirqs_on_thunk,trace_hardirqs_on_caller
+        thunk_ra trace_hardirqs_off_thunk,trace_hardirqs_off_caller
 #endif
 
 #ifdef CONFIG_DEBUG_LOCK_ALLOC