projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
[firefly-linux-kernel-4.4.55.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
hotplug-memory.c
diff --git
a/arch/powerpc/platforms/pseries/hotplug-memory.c
b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 24abc5c223c7fae14315d27659d9646bf6c813ed..c904583baf4b94d46e5a0ae3b4f5dca134a4bc87 100644
(file)
--- a/
arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/
arch/powerpc/platforms/pseries/hotplug-memory.c
@@
-194,7
+194,7
@@
static int pseries_update_drconf_memory(struct of_prop_reconfig *pr)
if (!memblock_size)
return -EINVAL;
- p = (u32 *)
of_get_property(pr->dn, "ibm,dynamic-memory", NULL)
;
+ p = (u32 *)
pr->old_prop->value
;
if (!p)
return -EINVAL;