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
d0f82c9
..
a0a94e0
100644
(file)
--- a/
arch/s390/appldata/appldata_base.c
+++ b/
arch/s390/appldata/appldata_base.c
@@
-617,6
+617,7
@@
appldata_offline_cpu(int cpu)
spin_unlock(&appldata_timer_lock);
}
spin_unlock(&appldata_timer_lock);
}
+#ifdef CONFIG_HOTPLUG_CPU
static int __cpuinit
appldata_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
static int __cpuinit
appldata_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
@@
-625,20
+626,19
@@
appldata_cpu_notify(struct notifier_block *self,
case CPU_ONLINE:
appldata_online_cpu((long) hcpu);
break;
case CPU_ONLINE:
appldata_online_cpu((long) hcpu);
break;
-#ifdef CONFIG_HOTPLUG_CPU
case CPU_DEAD:
appldata_offline_cpu((long) hcpu);
break;
case CPU_DEAD:
appldata_offline_cpu((long) hcpu);
break;
-#endif
default:
break;
}
return NOTIFY_OK;
}
default:
break;
}
return NOTIFY_OK;
}
-static struct notifier_block
__devinitdata
appldata_nb = {
+static struct notifier_block appldata_nb = {
.notifier_call = appldata_cpu_notify,
};
.notifier_call = appldata_cpu_notify,
};
+#endif
/*
* appldata_init()
/*
* appldata_init()
@@
-662,7
+662,7
@@
static int __init appldata_init(void)
appldata_online_cpu(i);
/* Register cpu hotplug notifier */
appldata_online_cpu(i);
/* Register cpu hotplug notifier */
- register_cpu_notifier(&appldata_nb);
+ register_
hot
cpu_notifier(&appldata_nb);
appldata_sysctl_header = register_sysctl_table(appldata_dir_table, 1);
#ifdef MODULE
appldata_sysctl_header = register_sysctl_table(appldata_dir_table, 1);
#ifdef MODULE