projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9e41d95
)
powerpc: Fix prom_init on 32-bit OF machines
author
Benjamin Herrenschmidt
<
[email protected]
>
Sun, 22 Mar 2009 16:04:53 +0000
(16:04 +0000)
committer
Benjamin Herrenschmidt
<
[email protected]
>
Tue, 24 Mar 2009 02:43:35 +0000
(13:43 +1100)
Commit
e7943fbbfdb6eef03c003b374de1f802cc14f02a
broke ppc32 using
Open Firmware client interface due to using the wrong relocation
macro when accessing the variable "linux_banner".
Signed-off-by: Benjamin Herrenschmidt <
[email protected]
>
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 4d5ebb46b2c412d965d5c4830af353256930f804..2e026c0407d4c2b69bed464cc28d3621a1d77f53 100644
(file)
--- a/
arch/powerpc/kernel/prom_init.c
+++ b/
arch/powerpc/kernel/prom_init.c
@@
-2283,7
+2283,7
@@
unsigned long __init prom_init(unsigned long r3, unsigned long r4,
*/
prom_init_stdout();
- prom_printf("Preparing to boot %s",
PTRRELOC((char *)
linux_banner));
+ prom_printf("Preparing to boot %s",
RELOC(
linux_banner));
/*
* Get default machine type. At this point, we do not differentiate