diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-11 22:08:12 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-11 22:08:12 +1000 |
| commit | fd582ec88eb8d2d907876603e4ecebe6eab330d9 (patch) | |
| tree | bafacc1916098001051b8235722daa6b9b52e63a /arch/ppc/kernel/setup.c | |
| parent | 35d81a4bfe28a6ea81c9f67c9ce40543124ded0b (diff) | |
| download | linux-fd582ec88eb8d2d907876603e4ecebe6eab330d9.tar.gz linux-fd582ec88eb8d2d907876603e4ecebe6eab330d9.tar.bz2 linux-fd582ec88eb8d2d907876603e4ecebe6eab330d9.zip | |
ppc: Various minor compile fixes
This fixes up a variety of minor problems in compiling with ARCH=ppc
arising from using the merged versions of various header files.
A lot of the changes are just adding #include <asm/machdep.h> to
files that use ppc_md or smp_ops_t.
This also arranges for us to use semaphore.c, vecemu.c, vector.S and
fpu.S from arch/powerpc/kernel when compiling with ARCH=ppc.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/kernel/setup.c')
| -rw-r--r-- | arch/ppc/kernel/setup.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index fae6335193ef..6bcb85d2b7fd 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c @@ -87,6 +87,9 @@ extern void chrp_init(unsigned long r3, unsigned long r4, dev_t boot_dev; #endif /* CONFIG_PPC_MULTIPLATFORM */ +int have_of; +EXPORT_SYMBOL(have_of); + #ifdef __DO_IRQ_CANON int ppc_do_canonicalize_irqs; EXPORT_SYMBOL(ppc_do_canonicalize_irqs); @@ -420,6 +423,8 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5, } #endif + have_of = 1; + /* prom_init has already been called from __start */ if (boot_infos) relocate_nodes(); @@ -735,7 +740,7 @@ void __init setup_arch(char **cmdline_p) #endif #ifdef CONFIG_XMON - xmon_map_scc(); + xmon_init(1); if (strstr(cmd_line, "xmon")) xmon(NULL); #endif /* CONFIG_XMON */ |