diff --git a/[refs] b/[refs]
index 5570932a853d..0d11ce8f4a81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f43fdad8627fec2d21df92799b254dceb66c9c3c
+refs/heads/master: 5568b139f4d196273958ae2947a736fdf1ffeece
diff --git a/trunk/lib/smp_processor_id.c b/trunk/lib/smp_processor_id.c
index e555ab62fbad..3b4dc098181e 100644
--- a/trunk/lib/smp_processor_id.c
+++ b/trunk/lib/smp_processor_id.c
@@ -37,7 +37,7 @@ notrace unsigned int debug_smp_processor_id(void)
 	/*
 	 * Avoid recursion:
 	 */
-	preempt_disable();
+	preempt_disable_notrace();
 
 	if (!printk_ratelimit())
 		goto out_enable;
@@ -49,7 +49,7 @@ notrace unsigned int debug_smp_processor_id(void)
 	dump_stack();
 
 out_enable:
-	preempt_enable_no_resched();
+	preempt_enable_no_resched_notrace();
 out:
 	return this_cpu;
 }