diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-12-05 14:29:55 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-12-05 14:29:55 +0800 |
| commit | 7724226d0e781f608c8141a7622ab93c7d36870e (patch) | |
| tree | 3bcfdad919c1bf8d547626282c2459fbf11d872b | |
| parent | d060b08b77e1f84e5b43e2c23677e56ad3427a49 (diff) | |
top/rcu: remove __cpuinit attr for few functions
Remove __cpuinit attr for functions:
topology_cpu_callback/rcu_init_percpu_data/rcu_cpu_notify to sync
up code with upstream and resolve the mismatch section issues.
Signed-off-by: Alex Shi <alex.shi@linaro.org>
| -rw-r--r-- | drivers/base/topology.c | 2 | ||||
| -rw-r--r-- | kernel/rcutree.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/topology.c b/drivers/base/topology.c index bcd19886fa1..8d05928591d 100644 --- a/drivers/base/topology.c +++ b/drivers/base/topology.c @@ -156,7 +156,7 @@ static void __cpuinit topology_remove_dev(unsigned int cpu) sysfs_remove_group(&dev->kobj, &topology_attr_group); } -static int __cpuinit topology_cpu_callback(struct notifier_block *nfb, +static int topology_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) { unsigned int cpu = (unsigned long)hcpu; diff --git a/kernel/rcutree.c b/kernel/rcutree.c index 93cf4a5d886..03cb3f1c520 100644 --- a/kernel/rcutree.c +++ b/kernel/rcutree.c @@ -3017,7 +3017,7 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp) * can accept some slop in the rsp->completed access due to the fact * that this CPU cannot possibly have any RCU callbacks in flight yet. */ -static void __cpuinit +static void rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible) { unsigned long flags; @@ -3081,7 +3081,7 @@ static void __cpuinit rcu_prepare_cpu(int cpu) /* * Handle CPU online/offline notification events. */ -static int __cpuinit rcu_cpu_notify(struct notifier_block *self, +static int rcu_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu) { long cpu = (long)hcpu; |