diff --git a/[refs] b/[refs]
index 9f1383da6dc7..2cfcb2e95d58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 445b5b499e0ca1584ee3aa8af298c9ef8c84d711
+refs/heads/master: 9faf06547efe11ccb51678c6805037c7377b85ee
diff --git a/trunk/arch/s390/appldata/appldata_base.c b/trunk/arch/s390/appldata/appldata_base.c
index 54d35c130907..f549a80cedb3 100644
--- a/trunk/arch/s390/appldata/appldata_base.c
+++ b/trunk/arch/s390/appldata/appldata_base.c
@@ -633,7 +633,7 @@ appldata_offline_cpu(int cpu)
 	spin_unlock(&appldata_timer_lock);
 }
 
-static int
+static int __cpuinit
 appldata_cpu_notify(struct notifier_block *self,
 		    unsigned long action, void *hcpu)
 {