diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-22 12:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-23 22:43:35 -0400 |
| commit | 151a9f4aef53fb9cc1e192c7d321c1d820232f4a (patch) | |
| tree | e515e2e3c17d595718721ddd6011148f6781a756 /arch/powerpc/kernel/prom_init.c | |
| parent | 9e41d9597e7825ec20d690013d32bcec5f3fe16a (diff) | |
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, | |||
| 2283 | */ | 2283 | */ |
| 2284 | prom_init_stdout(); | 2284 | prom_init_stdout(); |
| 2285 | 2285 | ||
| 2286 | prom_printf("Preparing to boot %s", PTRRELOC((char *)linux_banner)); | 2286 | prom_printf("Preparing to boot %s", RELOC(linux_banner)); |
| 2287 | 2287 | ||
| 2288 | /* | 2288 | /* |
| 2289 | * Get default machine type. At this point, we do not differentiate | 2289 | * Get default machine type. At this point, we do not differentiate |