diff options
| author | Paul Mackerras | 2005-10-22 08:02:39 +0200 |
|---|---|---|
| committer | Paul Mackerras | 2005-10-22 08:02:39 +0200 |
| commit | 35499c0195e46f479cf6ac16ad8d3f394b5fcc10 (patch) | |
| tree | 25660acd2425de5236a1eff7a25dc931e6f86492 /arch/powerpc/kernel/prom_init.c | |
| parent | powerpc: Make set_rtc_time() return error code from lower-level function (diff) | |
| download | kernel-qcow2-linux-35499c0195e46f479cf6ac16ad8d3f394b5fcc10.tar.gz kernel-qcow2-linux-35499c0195e46f479cf6ac16ad8d3f394b5fcc10.tar.xz kernel-qcow2-linux-35499c0195e46f479cf6ac16ad8d3f394b5fcc10.zip | |
powerpc: Merge in 64-bit powermac support.
This brings in a lot of changes from arch/ppc64/kernel/pmac_*.c to
arch/powerpc/platforms/powermac/*.c and makes various minor tweaks
elsewhere. On the powermac we now initialize ppc_md by copying
the whole pmac_md structure into it, which required some changes in
the ordering of initializations of individual fields of it.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 9b1baaa9eda0..095659d51b4b 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -772,7 +772,7 @@ static unsigned long __init prom_next_cell(int s, cell_t **cellp) } r = *p++; #ifdef CONFIG_PPC64 - if (s) { + if (s > 1) { r <<= 32; r |= *(p++); } @@ -2059,7 +2059,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, reloc_got2(-offset); #endif - __start(hdr, 0, 0); + __start(hdr, KERNELBASE + offset, 0); return 0; } |