diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-21 00:13:43 +0900 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-21 00:13:43 +0900 |
commit | 21d7f14b70fed254222a24e124e8771e1437be4c (patch) | |
tree | 3c52e48b28d5675bafa005e061b5639966671ca3 /arch/powerpc/platforms/pseries/hotplug-cpu.c | |
parent | eff6a902ff6b8a42f768c4b78fc63b9b8d0a41d9 (diff) | |
parent | 2ea8f7ea87f24735c49543c7f523919295028c58 (diff) |
Merge branch 'lsk/v3.14/topic/of' into linux-linaro-lsk-v3.14lsk-v3.14-15.02lsk-v3.14-14.02
Conflicts:
drivers/of/Kconfig
drivers/of/Makefile
drivers/of/address.c
drivers/of/selftest.c
include/linux/of.h
Diffstat (limited to 'arch/powerpc/platforms/pseries/hotplug-cpu.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/hotplug-cpu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c index 2d6fe89ff89d..d6eb25961211 100644 --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c @@ -338,16 +338,17 @@ static void pseries_remove_processor(struct device_node *np) } static int pseries_smp_notifier(struct notifier_block *nb, - unsigned long action, void *node) + unsigned long action, void *data) { + struct of_reconfig_data *rd = data; int err = 0; switch (action) { case OF_RECONFIG_ATTACH_NODE: - err = pseries_add_processor(node); + err = pseries_add_processor(rd->dn); break; case OF_RECONFIG_DETACH_NODE: - pseries_remove_processor(node); + pseries_remove_processor(rd->dn); break; } return notifier_from_errno(err); |