projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge gregkh@master.kernel.org:/home/rmk/linux-2.6-arm
[powerpc.git]
/
arch
/
s390
/
appldata
/
appldata_base.c
diff --git
a/arch/s390/appldata/appldata_base.c
b/arch/s390/appldata/appldata_base.c
index
6a4b5f9
..
a0a94e0
100644
(file)
--- a/
arch/s390/appldata/appldata_base.c
+++ b/
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)
{