diff options
| author | Kumar Gala <galak@gate.crashing.org> | 2006-01-11 17:57:13 -0600 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-12 20:09:29 +1100 |
| commit | cbbcf3401173f11f7e4c03c7ec8955ea29cd83b5 (patch) | |
| tree | 3728682606776f026ac120fee00db7d8ddbaa108 /arch/powerpc/kernel/prom_init.c | |
| parent | ea183a957abea8e05530a4536a9c2db16e9fdd85 (diff) | |
| download | blackbird-op-linux-cbbcf3401173f11f7e4c03c7ec8955ea29cd83b5.tar.gz blackbird-op-linux-cbbcf3401173f11f7e4c03c7ec8955ea29cd83b5.zip | |
[PATCH] powerpc: Fixed memory reserve map layout
powerpc: Fixed memory reserve map layout
The memory reserve map is suppose to be a pair of 64-bit integers
to represent each region. On ppc32 the code was treating the
pair as two 32-bit integers. Additional the prom_init code was
producing the wrong layout on ppc32.
Added a simple check to try to provide backwards compatibility.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/prom_init.c')
| -rw-r--r-- | arch/powerpc/kernel/prom_init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index e381f2fc121c..d963a12ec640 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -137,8 +137,8 @@ struct prom_t { }; struct mem_map_entry { - unsigned long base; - unsigned long size; + u64 base; + u64 size; }; typedef u32 cell_t; @@ -897,9 +897,9 @@ static unsigned long __init prom_next_cell(int s, cell_t **cellp) * If problems seem to show up, it would be a good start to track * them down. */ -static void reserve_mem(unsigned long base, unsigned long size) +static void reserve_mem(u64 base, u64 size) { - unsigned long top = base + size; + u64 top = base + size; unsigned long cnt = RELOC(mem_reserve_cnt); if (size == 0) |
