diff --git a/[refs] b/[refs]
index 483264bf369a..fa943d31fa87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c95dbf27e201587b2a6cf63f8501a0313d9b4801
+refs/heads/master: 70f454408e68fdba2c2529ab7d6ec3c3525e59f2
diff --git a/trunk/arch/s390/include/asm/smp.h b/trunk/arch/s390/include/asm/smp.h
index 024b91e06239..f89e2d5c060c 100644
--- a/trunk/arch/s390/include/asm/smp.h
+++ b/trunk/arch/s390/include/asm/smp.h
@@ -97,12 +97,6 @@ extern void arch_send_call_function_ipi(cpumask_t mask);
 #endif
 
 #ifndef CONFIG_SMP
-static inline void smp_send_stop(void)
-{
-	/* Disable all interrupts/machine checks */
-	__load_psw_mask(psw_kernel_bits & ~PSW_MASK_MCHECK);
-}
-
 #define hard_smp_processor_id()		0
 #define smp_cpu_not_running(cpu)	1
 #endif