diff --git a/[refs] b/[refs]
index d70fcf2505c0..08fabef51163 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b79d14e7a9f5d31b78bcd01a122f0c692e94a19
+refs/heads/master: 29a877fa1f402ce2c1a0c52957c4e29b9bb34216
diff --git a/trunk/arch/s390/include/asm/smp.h b/trunk/arch/s390/include/asm/smp.h
index a0a8340daafa..ce26ac3cb162 100644
--- a/trunk/arch/s390/include/asm/smp.h
+++ b/trunk/arch/s390/include/asm/smp.h
@@ -44,6 +44,7 @@ static inline void smp_call_online_cpu(void (*func)(void *), void *data)
 }
 
 static inline int smp_find_processor_id(int address) { return 0; }
+static inline int smp_store_status(int cpu) { return 0; }
 static inline int smp_vcpu_scheduled(int cpu) { return 1; }
 static inline void smp_yield_cpu(int cpu) { }
 static inline void smp_yield(void) { }