Commit 17eef325 authored by Keith M. Wesolowski's avatar Keith M. Wesolowski

Merge foobazco.org:/sources/2.5-bk

into foobazco.org:/sources/2.5-sparc-todave
parents 3201b05b 7b8b760c
...@@ -157,7 +157,6 @@ EXPORT_SYMBOL(___change_bit); ...@@ -157,7 +157,6 @@ EXPORT_SYMBOL(___change_bit);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
/* IRQ implementation. */ /* IRQ implementation. */
EXPORT_SYMBOL(global_irq_holder);
EXPORT_SYMBOL(synchronize_irq); EXPORT_SYMBOL(synchronize_irq);
/* Misc SMP information */ /* Misc SMP information */
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/vaddrs.h> #include <asm/vaddrs.h>
#include <asm/contregs.h> #include <asm/contregs.h>
#include <asm/thread_info.h>
.globl sun4m_cpu_startup, __smp4m_processor_id .globl sun4m_cpu_startup, __smp4m_processor_id
.globl sun4d_cpu_startup, __smp4d_processor_id .globl sun4d_cpu_startup, __smp4d_processor_id
......
...@@ -57,6 +57,11 @@ pte_t *sun4c_pte_offset(pmd_t * dir, unsigned long address) ...@@ -57,6 +57,11 @@ pte_t *sun4c_pte_offset(pmd_t * dir, unsigned long address)
return NULL; 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) void sun4c_update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t pte)
{ {
} }
......
...@@ -75,7 +75,7 @@ extern void fpsave(unsigned long *fpregs, unsigned long *fsr, ...@@ -75,7 +75,7 @@ extern void fpsave(unsigned long *fpregs, unsigned long *fsr,
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
#define SWITCH_ENTER(prv) \ #define SWITCH_ENTER(prv) \
do { \ do { \
if (test_tsk_thread_flag(prv, TIF_USEDFPU) { \ if (test_tsk_thread_flag(prv, TIF_USEDFPU)) { \
put_psr(get_psr() | PSR_EF); \ put_psr(get_psr() | PSR_EF); \
fpsave(&(prv)->thread.float_regs[0], &(prv)->thread.fsr, \ fpsave(&(prv)->thread.float_regs[0], &(prv)->thread.fsr, \
&(prv)->thread.fpqueue[0], &(prv)->thread.fpqdepth); \ &(prv)->thread.fpqueue[0], &(prv)->thread.fpqdepth); \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment