From 8c2a0e24168e48e7d9b0d624866eb67764668efe Mon Sep 17 00:00:00 2001
From: Gerald Schaefer <geraldsc@de.ibm.com>
Date: Mon, 7 Aug 2006 18:13:09 +0200
Subject: [PATCH] --- yaml --- r: 33371 b: refs/heads/master c:
 5cb900a34f640771a4ab6a178659c75022f2971a h: refs/heads/master i:   33369:
 2deb89714bcebd22dda22749a86718984fc9205c   33367:
 3a4d8dd6bd0750d298c233470ada414ae76bebfc v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/s390/appldata/appldata_base.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 926a899a809e..b1ef30de780c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37ab46a3f4983c32d5b5ab6a0366ec482e38ba47
+refs/heads/master: 5cb900a34f640771a4ab6a178659c75022f2971a
diff --git a/trunk/arch/s390/appldata/appldata_base.c b/trunk/arch/s390/appldata/appldata_base.c
index 6a4b5f9715c9..a0a94e0ef8d1 100644
--- a/trunk/arch/s390/appldata/appldata_base.c
+++ b/trunk/arch/s390/appldata/appldata_base.c
@@ -618,7 +618,7 @@ appldata_offline_cpu(int cpu)
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-static int
+static int __cpuinit
 appldata_cpu_notify(struct notifier_block *self,
 		    unsigned long action, void *hcpu)
 {