diff --git a/[refs] b/[refs]
index 26f468b404d2..085e0614f813 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7755d6b2c05bea032bf2470d771ad9b56e26015d
+refs/heads/master: 0d0e471b46d4ba1de4617d04cf071c6ae4a5df76
diff --git a/trunk/arch/s390/include/asm/smp.h b/trunk/arch/s390/include/asm/smp.h
index ce26ac3cb162..da7dcd7edf8e 100644
--- a/trunk/arch/s390/include/asm/smp.h
+++ b/trunk/arch/s390/include/asm/smp.h
@@ -43,7 +43,7 @@ static inline void smp_call_online_cpu(void (*func)(void *), void *data)
 	func(data);
 }
 
-static inline int smp_find_processor_id(int address) { return 0; }
+static inline int smp_find_processor_id(u16 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) { }