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/mm/numa.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/mm/numa.c')
| -rw-r--r-- | arch/powerpc/mm/numa.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index a5fff173be4f..c3ab060b94b2 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -1659,12 +1659,11 @@ static void stage_topology_update(int core_id) static int dt_update_callback(struct notifier_block *nb, unsigned long action, void *data) { - struct of_prop_reconfig *update; + struct of_reconfig_data *update = data; int rc = NOTIFY_DONE; switch (action) { case OF_RECONFIG_UPDATE_PROPERTY: - update = (struct of_prop_reconfig *)data; if (!of_prop_cmp(update->dn->type, "cpu") && !of_prop_cmp(update->prop->name, "ibm,associativity")) { u32 core_id; |