diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-10 22:50:37 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-10 22:50:37 +1000 |
| commit | 40ef8cbc6d360e564573eb19582249c35d8ba330 (patch) | |
| tree | abba70b7da8bef93a87431691dc8df79eb4425d5 /arch/powerpc/kernel/btext.c | |
| parent | bc6f8a4b199156897f6eb5b70bf5c1a4773f4e2b (diff) | |
| download | linux-40ef8cbc6d360e564573eb19582249c35d8ba330.tar.gz linux-40ef8cbc6d360e564573eb19582249c35d8ba330.tar.bz2 linux-40ef8cbc6d360e564573eb19582249c35d8ba330.zip | |
powerpc: Get 64-bit configs to compile with ARCH=powerpc
This is a bunch of mostly small fixes that are needed to get
ARCH=powerpc to compile for 64-bit. This adds setup_64.c from
arch/ppc64/kernel/setup.c and locks.c from arch/ppc64/lib/locks.c.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/btext.c')
| -rw-r--r-- | arch/powerpc/kernel/btext.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c index 44f5d98e27c0..bdfba92b2b38 100644 --- a/arch/powerpc/kernel/btext.c +++ b/arch/powerpc/kernel/btext.c @@ -50,7 +50,7 @@ static unsigned char vga_font[cmapsz]; int boot_text_mapped; int force_printk_to_btext = 0; - +#ifdef CONFIG_PPC32 /* Calc BAT values for mapping the display and store them * in disp_BAT. Those values are then used from head.S to map * the display during identify_machine() and MMU_Init() @@ -93,6 +93,7 @@ btext_prepare_BAT(void) } logicalDisplayBase = (void *) (vaddr + lowbits); } +#endif /* This function will enable the early boot text when doing OF booting. This * way, xmon output should work too |