diff options
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) | |||
772 | } | 772 | } |
773 | r = *p++; | 773 | r = *p++; |
774 | #ifdef CONFIG_PPC64 | 774 | #ifdef CONFIG_PPC64 |
775 | if (s) { | 775 | if (s > 1) { |
776 | r <<= 32; | 776 | r <<= 32; |
777 | r |= *(p++); | 777 | r |= *(p++); |
778 | } | 778 | } |
@@ -2059,7 +2059,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, | |||
2059 | reloc_got2(-offset); | 2059 | reloc_got2(-offset); |
2060 | #endif | 2060 | #endif |
2061 | 2061 | ||
2062 | __start(hdr, 0, 0); | 2062 | __start(hdr, KERNELBASE + offset, 0); |
2063 | 2063 | ||
2064 | return 0; | 2064 | return 0; |
2065 | } | 2065 | } |