Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / arch / x86 / entry / thunk_64.S

diff --git a/arch/x86/entry/thunk_64.S b/arch/x86/entry/thunk_64.S
index 3e95681b4e2dde8cabe3e5f8a0d2d4ceca4e23fa..efb2b932b7483419ec6921ac800506012e9030ae 100644 (file)
--- a/arch/x86/entry/thunk_64.S
+++ b/arch/x86/entry/thunk_64.S
@@ -46,9 +46,7 @@
 
 #ifdef CONFIG_PREEMPT
        THUNK ___preempt_schedule, preempt_schedule
-#ifdef CONFIG_CONTEXT_TRACKING
-       THUNK ___preempt_schedule_context, preempt_schedule_context
-#endif
+       THUNK ___preempt_schedule_notrace, preempt_schedule_notrace
 #endif
 
 #if defined(CONFIG_TRACE_IRQFLAGS) \