path: root/kernel/cpu.c
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2015-08-31 08:47:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-31 08:47:40 -0700
commit1af115d675f323afee1e64650277a9b170845b81 (patch)
tree70cad880fa61a92b585c4b1654e2affbae88de16 /kernel/cpu.c
parent1c00038c765561c08fd942d08579fa860e604f31 (diff)
parent71db87ba570038497db1227b7dc61113c4156565 (diff)
Merge tag 'driver-core-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updates from Greg KH: "Here is the new patches for the driver core / sysfs for 4.3-rc1. Very small number of changes here, all the details are in the shortlog, nothing major happening at all this kernel release, which is nice to see" * tag 'driver-core-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: bus: subsys: update return type of ->remove_dev() to void driver core: correct device's shutdown order driver core: fix docbook for device_private.device selftests: firmware: skip timeout checks for kernels without user mode helper kernel, cpu: Remove bogus __ref annotations cpu: Remove bogus __ref annotation of cpu_subsys_online() firmware: fix wrong memory deallocation in fw_add_devm_name() sysfs.txt: update show method notes about sprintf/snprintf/scnprintf usage devres: fix devres_get()
Diffstat (limited to 'kernel/cpu.c')
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 718ea76b78ba..964b4efadf41 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -206,7 +206,7 @@ EXPORT_SYMBOL_GPL(cpu_hotplug_enable);
/* Need to know about CPUs going up/down? */
-int __ref register_cpu_notifier(struct notifier_block *nb)
+int register_cpu_notifier(struct notifier_block *nb)
int ret;
@@ -215,7 +215,7 @@ int __ref register_cpu_notifier(struct notifier_block *nb)
return ret;
-int __ref __register_cpu_notifier(struct notifier_block *nb)
+int __register_cpu_notifier(struct notifier_block *nb)
return raw_notifier_chain_register(&cpu_chain, nb);
@@ -245,7 +245,7 @@ static void cpu_notify_nofail(unsigned long val, void *v)
-void __ref unregister_cpu_notifier(struct notifier_block *nb)
+void unregister_cpu_notifier(struct notifier_block *nb)
raw_notifier_chain_unregister(&cpu_chain, nb);
@@ -253,7 +253,7 @@ void __ref unregister_cpu_notifier(struct notifier_block *nb)
-void __ref __unregister_cpu_notifier(struct notifier_block *nb)
+void __unregister_cpu_notifier(struct notifier_block *nb)
raw_notifier_chain_unregister(&cpu_chain, nb);
@@ -330,7 +330,7 @@ struct take_cpu_down_param {
/* Take this CPU down. */
-static int __ref take_cpu_down(void *_param)
+static int take_cpu_down(void *_param)
struct take_cpu_down_param *param = _param;
int err;
@@ -349,7 +349,7 @@ static int __ref take_cpu_down(void *_param)
/* Requires cpu_add_remove_lock to be held */
-static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
+static int _cpu_down(unsigned int cpu, int tasks_frozen)
int err, nr_calls = 0;
void *hcpu = (void *)(long)cpu;
@@ -443,7 +443,7 @@ out_release:
return err;
-int __ref cpu_down(unsigned int cpu)
+int cpu_down(unsigned int cpu)
int err;
@@ -633,7 +633,7 @@ void __weak arch_enable_nonboot_cpus_end(void)
-void __ref enable_nonboot_cpus(void)
+void enable_nonboot_cpus(void)
int cpu, error;