Commit 22508f3d authored by Nathan Fontenot's avatar Nathan Fontenot Committed by Michael Ellerman

powerpc/numa: Look up device node in of_get_usable_memory()

Look up the device node for the usable memory property instead
of having it passed in as a parameter. This changes precedes an update
in which the calling routines for of_get_usable_memory() will not have
the device node pointer to pass in.
Signed-off-by: default avatarNathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 35f80deb
...@@ -184,11 +184,19 @@ static const __be32 *of_get_associativity(struct device_node *dev) ...@@ -184,11 +184,19 @@ static const __be32 *of_get_associativity(struct device_node *dev)
* it exists (the property exists only in kexec/kdump kernels, * it exists (the property exists only in kexec/kdump kernels,
* added by kexec-tools) * added by kexec-tools)
*/ */
static const __be32 *of_get_usable_memory(struct device_node *memory) static const __be32 *of_get_usable_memory(void)
{ {
struct device_node *memory;
const __be32 *prop; const __be32 *prop;
u32 len; u32 len;
memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
if (!memory)
return NULL;
prop = of_get_property(memory, "linux,drconf-usable-memory", &len); prop = of_get_property(memory, "linux,drconf-usable-memory", &len);
of_node_put(memory);
if (!prop || len < sizeof(unsigned int)) if (!prop || len < sizeof(unsigned int))
return NULL; return NULL;
return prop; return prop;
...@@ -674,7 +682,7 @@ static void __init parse_drconf_memory(struct device_node *memory) ...@@ -674,7 +682,7 @@ static void __init parse_drconf_memory(struct device_node *memory)
return; return;
/* check if this is a kexec/kdump kernel */ /* check if this is a kexec/kdump kernel */
usm = of_get_usable_memory(memory); usm = of_get_usable_memory();
if (usm != NULL) if (usm != NULL)
is_kexec_kdump = 1; is_kexec_kdump = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment