diff options
| author | Keith M. Wesolowski <wesolows@foobazco.org> | 2004-02-26 06:43:55 -0800 |
|---|---|---|
| committer | Keith M. Wesolowski <wesolows@foobazco.org> | 2004-02-26 06:43:55 -0800 |
| commit | 7b8b760c3844160bd70adadda7aa6a32f3f243bd (patch) | |
| tree | b7b322cebb3d4f11f1099f7b6868557ec5695895 | |
| parent | ff4dc41e80523dc9e488e99f41985bd2f7b4620c (diff) | |
| parent | 87384119190c78d74c5e1256fffa3e5604f515b9 (diff) | |
Merge foobazco.org:/sources/2.5-sparc-smp
into foobazco.org:/sources/2.5-sparc-todave
| -rw-r--r-- | arch/sparc/kernel/sparc_ksyms.c | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/trampoline.S | 1 | ||||
| -rw-r--r-- | arch/sparc/mm/nosun4c.c | 5 | ||||
| -rw-r--r-- | include/asm-sparc/system.h | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c index 6abb5adc6996..600a4bee09b2 100644 --- a/arch/sparc/kernel/sparc_ksyms.c +++ b/arch/sparc/kernel/sparc_ksyms.c @@ -157,7 +157,6 @@ EXPORT_SYMBOL(___change_bit); #ifdef CONFIG_SMP /* IRQ implementation. */ -EXPORT_SYMBOL(global_irq_holder); EXPORT_SYMBOL(synchronize_irq); /* Misc SMP information */ diff --git a/arch/sparc/kernel/trampoline.S b/arch/sparc/kernel/trampoline.S index 806f44846cd5..1db353f4668e 100644 --- a/arch/sparc/kernel/trampoline.S +++ b/arch/sparc/kernel/trampoline.S @@ -13,6 +13,7 @@ #include <asm/ptrace.h> #include <asm/vaddrs.h> #include <asm/contregs.h> +#include <asm/thread_info.h> .globl sun4m_cpu_startup, __smp4m_processor_id .globl sun4d_cpu_startup, __smp4d_processor_id diff --git a/arch/sparc/mm/nosun4c.c b/arch/sparc/mm/nosun4c.c index 8ed9dcf00b25..ea2e2105341d 100644 --- a/arch/sparc/mm/nosun4c.c +++ b/arch/sparc/mm/nosun4c.c @@ -57,6 +57,11 @@ pte_t *sun4c_pte_offset(pmd_t * dir, unsigned long address) return NULL; } +pte_t *sun4c_pte_offset_kernel(pmd_t *dir, unsigned long address) +{ + return NULL; +} + void sun4c_update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t pte) { } diff --git a/include/asm-sparc/system.h b/include/asm-sparc/system.h index a4c7d566e075..2497d51bbc9f 100644 --- a/include/asm-sparc/system.h +++ b/include/asm-sparc/system.h @@ -75,7 +75,7 @@ extern void fpsave(unsigned long *fpregs, unsigned long *fsr, #ifdef CONFIG_SMP #define SWITCH_ENTER(prv) \ do { \ - if (test_tsk_thread_flag(prv, TIF_USEDFPU) { \ + if (test_tsk_thread_flag(prv, TIF_USEDFPU)) { \ put_psr(get_psr() | PSR_EF); \ fpsave(&(prv)->thread.float_regs[0], &(prv)->thread.fsr, \ &(prv)->thread.fpqueue[0], &(prv)->thread.fpqdepth); \ |