projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9994a33
)
powerpc: Make prom_init.c suitable for both 32-bit and 64-bit
author
Paul Mackerras
<paulus@samba.org>
Mon, 10 Oct 2005 12:37:16 +0000
(22:37 +1000)
committer
Paul Mackerras
<paulus@samba.org>
Mon, 10 Oct 2005 12:37:16 +0000
(22:37 +1000)
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/prom_init.c
patch
|
blob
|
history
diff --git
a/arch/powerpc/kernel/prom_init.c
b/arch/powerpc/kernel/prom_init.c
index
e01cda1
..
75b487f
100644
(file)
--- a/
arch/powerpc/kernel/prom_init.c
+++ b/
arch/powerpc/kernel/prom_init.c
@@
-1968,9
+1968,9
@@
unsigned long __init prom_init(unsigned long r3, unsigned long r4,
extern char _stext[];
unsigned long hdr;
u32 getprop_rval;
+ unsigned long offset = reloc_offset();
#ifdef CONFIG_PPC32
- unsigned long offset = reloc_offset();
reloc_got2(offset);
#endif