diff options
| author | Benjamin Herrenschmidt | 2009-03-22 17:04:53 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2009-03-24 03:43:35 +0100 |
| commit | 151a9f4aef53fb9cc1e192c7d321c1d820232f4a (patch) | |
| tree | e515e2e3c17d595718721ddd6011148f6781a756 /arch/powerpc/kernel/prom_init.c | |
| parent | Merge commit 'origin/master' into next (diff) | |
| download | kernel-qcow2-linux-151a9f4aef53fb9cc1e192c7d321c1d820232f4a.tar.gz kernel-qcow2-linux-151a9f4aef53fb9cc1e192c7d321c1d820232f4a.tar.xz kernel-qcow2-linux-151a9f4aef53fb9cc1e192c7d321c1d820232f4a.zip | |
powerpc: Fix prom_init on 32-bit OF machines
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 <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/prom_init.c')
| -rw-r--r-- | arch/powerpc/kernel/prom_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 4d5ebb46b2c4..2e026c0407d4 100644 --- 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 |