diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2005-12-04 18:39:55 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-09 14:52:38 +1100 |
| commit | ba7594852f4e7121b3f037d59f983637b795f0dd (patch) | |
| tree | 6949f16d3dff337b4b36ced0b460e4ed9b09365b /arch/powerpc/mm | |
| parent | 54c32021eb6feafc32e90104e960b38301521b7b (diff) | |
| download | linux-ba7594852f4e7121b3f037d59f983637b795f0dd.tar.bz2 | |
[PATCH] powerpc: Add support for "linux,usable-memory" on memory nodes
Milton has proposed that we should support a "linux,usable-memory" property
on memory nodes which describes, in preference to "reg", the regions of memory
Linux should use.
This facility is required for kdump to inform the second kernel which memory
it should use.
Signed-off-by: Haren Myneni <haren@us.ibm.com>
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/numa.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 40c99deb691b..97e83f1d1bdb 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -423,7 +423,12 @@ static int __init parse_numa_properties(void) unsigned int *memcell_buf; unsigned int len; - memcell_buf = (unsigned int *)get_property(memory, "reg", &len); + memcell_buf = (unsigned int *)get_property(memory, + "linux,usable-memory", &len); + if (!memcell_buf || len <= 0) + memcell_buf = + (unsigned int *)get_property(memory, "reg", + &len); if (!memcell_buf || len <= 0) continue; |