diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-16 16:57:48 +0900 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-16 16:57:48 +0900 |
commit | 7710601a8b24a3f77ebdfc7b213c21344c650987 (patch) | |
tree | fbea2187b1d65430356fd4697f8db7433a28f272 /arch/powerpc/mm | |
parent | 13beb8851e931b3cfb3403c3a62bfee9ab27a60c (diff) | |
parent | e60dc703729b117d0b617249bcae373a430ebade (diff) |
Merge remote-tracking branch 'lsk/v3.10/topic/of' into linux-linaro-lsk
Conflicts:
arch/powerpc/kernel/prom.c
drivers/of/Kconfig
drivers/of/Makefile
drivers/of/selftest.c
include/linux/of.h
Diffstat (limited to 'arch/powerpc/mm')
-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 08c6f3185d45..51663518ea40 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -1633,12 +1633,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; |