1 files changed, 16 insertions, 4 deletions

diff --git a/arch/x86/lib/thunk_32.S b/arch/x86/lib/thunk_32.S
index 28f85c916712..e9acf5f4fc92 100644
--- a/arch/x86/lib/thunk_32.S
+++ b/arch/x86/lib/thunk_32.S
@@ -7,16 +7,19 @@
         #include <linux/linkage.h>
         #include <asm/asm.h>
 
-#ifdef CONFIG_TRACE_IRQFLAGS
         /* put return address in eax (arg1) */
-        .macro thunk_ra name,func
+        .macro THUNK name, func, put_ret_addr_in_eax=0
         .globl \name
 \name:
         pushl %eax
         pushl %ecx
         pushl %edx
+
+        .if \put_ret_addr_in_eax
         /* Place EIP in the arg1 */
         movl 3*4(%esp), %eax
+        .endif
+
         call \func
         popl %edx
         popl %ecx
@@ -25,6 +28,15 @@
         _ASM_NOKPROBE(\name)
         .endm
 
-        thunk_ra trace_hardirqs_on_thunk,trace_hardirqs_on_caller
-        thunk_ra trace_hardirqs_off_thunk,trace_hardirqs_off_caller
+#ifdef CONFIG_TRACE_IRQFLAGS
+        THUNK trace_hardirqs_on_thunk,trace_hardirqs_on_caller,1
+        THUNK trace_hardirqs_off_thunk,trace_hardirqs_off_caller,1
+#endif
+
+#ifdef CONFIG_PREEMPT
+        THUNK ___preempt_schedule, preempt_schedule
+#ifdef CONFIG_CONTEXT_TRACKING
+        THUNK ___preempt_schedule_context, preempt_schedule_context
 #endif
+#endif
+