diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
| commit | 168660f24dfc46c2702acbe4701a446f42a59578 (patch) | |
| tree | f431368afbf6b1b71809cf3fd904d800ea126f4d /arch/ppc/kernel | |
| parent | 6420f767924fa73b0ea267864d96820815f4ba5a (diff) | |
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'arch/ppc/kernel')
| -rw-r--r-- | arch/ppc/kernel/pci.c | 1 | ||||
| -rw-r--r-- | arch/ppc/kernel/pmac_backlight.c | 1 | ||||
| -rw-r--r-- | arch/ppc/kernel/pmac_setup.c | 2 | ||||
| -rw-r--r-- | arch/ppc/kernel/ppc_ksyms.c | 11 | ||||
| -rw-r--r-- | arch/ppc/kernel/syscalls.c | 1 |
5 files changed, 12 insertions, 4 deletions
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c index cfa26b67d..6233e5f9b 100644 --- a/arch/ppc/kernel/pci.c +++ b/arch/ppc/kernel/pci.c @@ -4,7 +4,6 @@ */ #include <linux/kernel.h> -#include <linux/config.h> #include <linux/pci.h> #include <linux/delay.h> #include <linux/string.h> diff --git a/arch/ppc/kernel/pmac_backlight.c b/arch/ppc/kernel/pmac_backlight.c index c4426a0b0..8c6244632 100644 --- a/arch/ppc/kernel/pmac_backlight.c +++ b/arch/ppc/kernel/pmac_backlight.c @@ -6,6 +6,7 @@ * */ +#include <linux/config.h> #include <linux/kernel.h> #include <linux/stddef.h> #include <linux/reboot.h> diff --git a/arch/ppc/kernel/pmac_setup.c b/arch/ppc/kernel/pmac_setup.c index ec8c6eca4..658d7c226 100644 --- a/arch/ppc/kernel/pmac_setup.c +++ b/arch/ppc/kernel/pmac_setup.c @@ -120,6 +120,8 @@ static void init_uninorth(void); void pmac_progress(char *s, unsigned short hex); #endif +sys_ctrler_t sys_ctrler = SYS_CTRLER_UNKNOWN; + __pmac int pmac_get_cpuinfo(char *buffer) diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c index b140dd25c..3f0b52ead 100644 --- a/arch/ppc/kernel/ppc_ksyms.c +++ b/arch/ppc/kernel/ppc_ksyms.c @@ -36,6 +36,7 @@ #include <asm/machdep.h> #include <asm/hw_irq.h> #include <asm/nvram.h> +#include <asm/mmu_context.h> #ifdef CONFIG_SMP #include <asm/smplock.h> #endif /* CONFIG_SMP */ @@ -83,9 +84,9 @@ EXPORT_SYMBOL(kernel_flag); #endif /* CONFIG_SMP */ #if !defined(CONFIG_4xx) && !defined(CONFIG_8xx) -EXPORT_SYMBOL(isa_io_base); -EXPORT_SYMBOL(isa_mem_base); -EXPORT_SYMBOL(pci_dram_offset); +EXPORT_SYMBOL_NOVERS(isa_io_base); +EXPORT_SYMBOL_NOVERS(isa_mem_base); +EXPORT_SYMBOL_NOVERS(pci_dram_offset); #endif EXPORT_SYMBOL(ISA_DMA_THRESHOLD); EXPORT_SYMBOL(DMA_MODE_READ); @@ -223,6 +224,7 @@ EXPORT_SYMBOL(pmu_unregister_sleep_notifier); EXPORT_SYMBOL(pmu_enable_irled); #endif CONFIG_PMAC_PBOOK #if defined(CONFIG_ALL_PPC) +EXPORT_SYMBOL_NOVERS(sys_ctrler); EXPORT_SYMBOL(find_devices); EXPORT_SYMBOL(find_type_devices); EXPORT_SYMBOL(find_compatible_devices); @@ -306,3 +308,6 @@ EXPORT_SYMBOL(debugger_fault_handler); EXPORT_SYMBOL(ret_to_user_hook); EXPORT_SYMBOL(do_softirq); +EXPORT_SYMBOL(next_mmu_context); +EXPORT_SYMBOL(set_context); +EXPORT_SYMBOL(mmu_context_overflow); diff --git a/arch/ppc/kernel/syscalls.c b/arch/ppc/kernel/syscalls.c index 4c1802135..314c1240c 100644 --- a/arch/ppc/kernel/syscalls.c +++ b/arch/ppc/kernel/syscalls.c @@ -20,6 +20,7 @@ * */ +#include <linux/config.h> #include <linux/errno.h> #include <linux/sched.h> #include <linux/mm.h> |