diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-10 08:58:10 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-10 08:58:10 -0400 |
commit | e574d238ab907963ae6f97cb6bf12bb8fd48c376 (patch) | |
tree | 038a29b3ec5d61a6f5cb3f17ae671ea6471eeb47 /arch/powerpc | |
parent | c5200c90db3823a6e2f529acf202c4aed04966ae (diff) |
powerpc: Fix compilation for 32-bit configs
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/setup_32.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 27d7f828212b..bfa155c00ea5 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c | |||
@@ -70,6 +70,8 @@ unsigned long ISA_DMA_THRESHOLD; | |||
70 | unsigned int DMA_MODE_READ; | 70 | unsigned int DMA_MODE_READ; |
71 | unsigned int DMA_MODE_WRITE; | 71 | unsigned int DMA_MODE_WRITE; |
72 | 72 | ||
73 | int have_of = 1; | ||
74 | |||
73 | #ifdef CONFIG_PPC_MULTIPLATFORM | 75 | #ifdef CONFIG_PPC_MULTIPLATFORM |
74 | int _machine = 0; | 76 | int _machine = 0; |
75 | 77 | ||
@@ -89,6 +91,7 @@ unsigned long vgacon_remap_base; | |||
89 | #endif | 91 | #endif |
90 | 92 | ||
91 | struct machdep_calls ppc_md; | 93 | struct machdep_calls ppc_md; |
94 | EXPORT_SYMBOL(ppc_md); | ||
92 | 95 | ||
93 | /* | 96 | /* |
94 | * These are used in binfmt_elf.c to put aux entries on the stack | 97 | * These are used in binfmt_elf.c to put aux entries on the stack |
@@ -455,24 +458,6 @@ console_initcall(set_preferred_console); | |||
455 | #endif /* CONFIG_SERIAL_CORE_CONSOLE */ | 458 | #endif /* CONFIG_SERIAL_CORE_CONSOLE */ |
456 | #endif /* CONFIG_PPC_MULTIPLATFORM */ | 459 | #endif /* CONFIG_PPC_MULTIPLATFORM */ |
457 | 460 | ||
458 | struct bi_record *find_bootinfo(void) | ||
459 | { | ||
460 | struct bi_record *rec; | ||
461 | |||
462 | rec = (struct bi_record *)_ALIGN((ulong)__bss_start+(1<<20)-1,(1<<20)); | ||
463 | if ( rec->tag != BI_FIRST ) { | ||
464 | /* | ||
465 | * This 0x10000 offset is a terrible hack but it will go away when | ||
466 | * we have the bootloader handle all the relocation and | ||
467 | * prom calls -- Cort | ||
468 | */ | ||
469 | rec = (struct bi_record *)_ALIGN((ulong)__bss_start+0x10000+(1<<20)-1,(1<<20)); | ||
470 | if ( rec->tag != BI_FIRST ) | ||
471 | return NULL; | ||
472 | } | ||
473 | return rec; | ||
474 | } | ||
475 | |||
476 | /* | 461 | /* |
477 | * Find out what kind of machine we're on and save any data we need | 462 | * Find out what kind of machine we're on and save any data we need |
478 | * from the early boot process (devtree is copied on pmac by prom_init()). | 463 | * from the early boot process (devtree is copied on pmac by prom_init()). |