Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

9 files changed, 147 insertions, 99 deletions

diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
index b99f81c4906f..bd8601601afa 100644
--- a/arch/sparc/mm/fault_32.c
+++ b/arch/sparc/mm/fault_32.c
@@ -18,6 +18,7 @@
 #include <linux/signal.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
+#include <linux/perf_event.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/kdebug.h>
@@ -34,6 +35,8 @@
 
 extern int prom_node_root;
 
+int show_unhandled_signals = 1;
+
 /* At boot time we determine these two values necessary for setting
  * up the segment maps and page table entries (pte's).
  */
@@ -148,6 +151,45 @@ asmlinkage int lookup_fault(unsigned long pc, unsigned long ret_pc,
         return 0;
 }
 
+static inline void
+show_signal_msg(struct pt_regs *regs, int sig, int code,
+                unsigned long address, struct task_struct *tsk)
+{
+        if (!unhandled_signal(tsk, sig))
+                return;
+
+        if (!printk_ratelimit())
+                return;
+
+        printk("%s%s[%d]: segfault at %lx ip %p (rpc %p) sp %p error %x",
+               task_pid_nr(tsk) > 1 ? KERN_INFO : KERN_EMERG,
+               tsk->comm, task_pid_nr(tsk), address,
+               (void *)regs->pc, (void *)regs->u_regs[UREG_I7],
+               (void *)regs->u_regs[UREG_FP], code);
+
+        print_vma_addr(KERN_CONT " in ", regs->pc);
+
+        printk(KERN_CONT "\n");
+}
+
+static void __do_fault_siginfo(int code, int sig, struct pt_regs *regs,
+                               unsigned long addr)
+{
+        siginfo_t info;
+
+        info.si_signo = sig;
+        info.si_code = code;
+        info.si_errno = 0;
+        info.si_addr = (void __user *) addr;
+        info.si_trapno = 0;
+
+        if (unlikely(show_unhandled_signals))
+                show_signal_msg(regs, sig, info.si_code,
+                                addr, current);
+
+        force_sig_info (sig, &info, current);
+}
+
 extern unsigned long safe_compute_effective_address(struct pt_regs *,
                                                     unsigned int);
 
@@ -167,6 +209,14 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
         return safe_compute_effective_address(regs, insn);
 }
 
+static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
+                                      int text_fault)
+{
+        unsigned long addr = compute_si_addr(regs, text_fault);
+
+        __do_fault_siginfo(code, sig, regs, addr);
+}
+
 asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
                                unsigned long address)
 {
@@ -175,9 +225,8 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
         struct mm_struct *mm = tsk->mm;
         unsigned int fixup;
         unsigned long g2;
-        siginfo_t info;
         int from_user = !(regs->psr & PSR_PS);
-        int fault;
+        int fault, code;
 
         if(text_fault)
                 address = regs->pc;
@@ -194,7 +243,7 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
         if (!ARCH_SUN4C && address >= TASK_SIZE)
                 goto vmalloc_fault;
 
-        info.si_code = SEGV_MAPERR;
+        code = SEGV_MAPERR;
 
         /*
          * If we're in an interrupt or have no user
@@ -203,6 +252,8 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
         if (in_atomic() || !mm)
                 goto no_context;
 
+        perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
+
         down_read(&mm->mmap_sem);
 
         /*
@@ -226,7 +277,7 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
          * we can handle it..
          */
 good_area:
-        info.si_code = SEGV_ACCERR;
+        code = SEGV_ACCERR;
         if(write) {
                 if(!(vma->vm_flags & VM_WRITE))
                         goto bad_area;
@@ -249,10 +300,15 @@ good_area:
                         goto do_sigbus;
                 BUG();
         }
-        if (fault & VM_FAULT_MAJOR)
+        if (fault & VM_FAULT_MAJOR) {
                 current->maj_flt++;
-        else
+                perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
+                              regs, address);
+        } else {
                 current->min_flt++;
+                perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
+                              regs, address);
+        }
         up_read(&mm->mmap_sem);
         return;
 
@@ -265,18 +321,8 @@ bad_area:
 
 bad_area_nosemaphore:
         /* User mode accesses just cause a SIGSEGV */
-        if(from_user) {
-#if 0
-                printk("Fault whee %s [%d]: segfaults at %08lx pc=%08lx\n",
-                       tsk->comm, tsk->pid, address, regs->pc);
-#endif
-                info.si_signo = SIGSEGV;
-                info.si_errno = 0;
-                /* info.si_code set above to make clear whether
-                   this was a SEGV_MAPERR or SEGV_ACCERR fault.  */
-                info.si_addr = (void __user *)compute_si_addr(regs, text_fault);
-                info.si_trapno = 0;
-                force_sig_info (SIGSEGV, &info, tsk);
+        if (from_user) {
+                do_fault_siginfo(code, SIGSEGV, regs, text_fault);
                 return;
         }
 
@@ -327,12 +373,7 @@ out_of_memory:
 
 do_sigbus:
         up_read(&mm->mmap_sem);
-        info.si_signo = SIGBUS;
-        info.si_errno = 0;
-        info.si_code = BUS_ADRERR;
-        info.si_addr = (void __user *) compute_si_addr(regs, text_fault);
-        info.si_trapno = 0;
-        force_sig_info (SIGBUS, &info, tsk);
+        do_fault_siginfo(BUS_ADRERR, SIGBUS, regs, text_fault);
         if (!from_user)
                 goto no_context;
 
@@ -370,7 +411,7 @@ asmlinkage void do_sun4c_fault(struct pt_regs *regs, int text_fault, int write,
                                unsigned long address)
 {
         extern void sun4c_update_mmu_cache(struct vm_area_struct *,
-                                           unsigned long,pte_t);
+                                           unsigned long,pte_t *);
         extern pte_t *sun4c_pte_offset_kernel(pmd_t *,unsigned long);
         struct task_struct *tsk = current;
         struct mm_struct *mm = tsk->mm;
@@ -447,7 +488,7 @@ asmlinkage void do_sun4c_fault(struct pt_regs *regs, int text_fault, int write,
                  *       on the CPU and doing a shrink_mmap() on this vma.
                  */
                 sun4c_update_mmu_cache (find_vma(current->mm, address), address,
-                                        *ptep);
+                                        ptep);
         else
                 do_sparc_fault(regs, text_fault, write, address);
 }
@@ -458,14 +499,10 @@ static void force_user_fault(unsigned long address, int write)
         struct vm_area_struct *vma;
         struct task_struct *tsk = current;
         struct mm_struct *mm = tsk->mm;
-        siginfo_t info;
+        int code;
 
-        info.si_code = SEGV_MAPERR;
+        code = SEGV_MAPERR;
 
-#if 0
-        printk("wf<pid=%d,wr=%d,addr=%08lx>\n",
-               tsk->pid, write, address);
-#endif
         down_read(&mm->mmap_sem);
         vma = find_vma(mm, address);
         if(!vma)
@@ -477,7 +514,7 @@ static void force_user_fault(unsigned long address, int write)
         if(expand_stack(vma, address))
                 goto bad_area;
 good_area:
-        info.si_code = SEGV_ACCERR;
+        code = SEGV_ACCERR;
         if(write) {
                 if(!(vma->vm_flags & VM_WRITE))
                         goto bad_area;
@@ -494,27 +531,12 @@ good_area:
         return;
 bad_area:
         up_read(&mm->mmap_sem);
-#if 0
-        printk("Window whee %s [%d]: segfaults at %08lx\n",
-               tsk->comm, tsk->pid, address);
-#endif
-        info.si_signo = SIGSEGV;
-        info.si_errno = 0;
-        /* info.si_code set above to make clear whether
-           this was a SEGV_MAPERR or SEGV_ACCERR fault.  */
-        info.si_addr = (void __user *) address;
-        info.si_trapno = 0;
-        force_sig_info (SIGSEGV, &info, tsk);
+        __do_fault_siginfo(code, SIGSEGV, tsk->thread.kregs, address);
         return;
 
 do_sigbus:
         up_read(&mm->mmap_sem);
-        info.si_signo = SIGBUS;
-        info.si_errno = 0;
-        info.si_code = BUS_ADRERR;
-        info.si_addr = (void __user *) address;
-        info.si_trapno = 0;
-        force_sig_info (SIGBUS, &info, tsk);
+        __do_fault_siginfo(BUS_ADRERR, SIGBUS, tsk->thread.kregs, address);
 }
 
 void window_overflow_fault(void)
diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
index 43b0da96a4fb..f92ce56a8b22 100644
--- a/arch/sparc/mm/fault_64.c
+++ b/arch/sparc/mm/fault_64.c
@@ -16,6 +16,7 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/perf_event.h>
 #include <linux/interrupt.h>
 #include <linux/kprobes.h>
 #include <linux/kdebug.h>
@@ -31,13 +32,14 @@
 #include <asm/sections.h>
 #include <asm/mmu_context.h>
 
-#ifdef CONFIG_KPROBES
-static inline int notify_page_fault(struct pt_regs *regs)
+int show_unhandled_signals = 1;
+
+static inline __kprobes int notify_page_fault(struct pt_regs *regs)
 {
         int ret = 0;
 
         /* kprobe_running() needs smp_processor_id() */
-        if (!user_mode(regs)) {
+        if (kprobes_built_in() && !user_mode(regs)) {
                 preempt_disable();
                 if (kprobe_running() && kprobe_fault_handler(regs, 0))
                         ret = 1;
@@ -45,12 +47,6 @@ static inline int notify_page_fault(struct pt_regs *regs)
         }
         return ret;
 }
-#else
-static inline int notify_page_fault(struct pt_regs *regs)
-{
-        return 0;
-}
-#endif
 
 static void __kprobes unhandled_fault(unsigned long address,
                                       struct task_struct *tsk,
@@ -73,7 +69,7 @@ static void __kprobes unhandled_fault(unsigned long address,
         die_if_kernel("Oops", regs);
 }
 
-static void bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
+static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
 {
         printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
                regs->tpc);
@@ -134,22 +130,48 @@ outret:
         return insn;
 }
 
+static inline void
+show_signal_msg(struct pt_regs *regs, int sig, int code,
+                unsigned long address, struct task_struct *tsk)
+{
+        if (!unhandled_signal(tsk, sig))
+                return;
+
+        if (!printk_ratelimit())
+                return;
+
+        printk("%s%s[%d]: segfault at %lx ip %p (rpc %p) sp %p error %x",
+               task_pid_nr(tsk) > 1 ? KERN_INFO : KERN_EMERG,
+               tsk->comm, task_pid_nr(tsk), address,
+               (void *)regs->tpc, (void *)regs->u_regs[UREG_I7],
+               (void *)regs->u_regs[UREG_FP], code);
+
+        print_vma_addr(KERN_CONT " in ", regs->tpc);
+
+        printk(KERN_CONT "\n");
+}
+
 extern unsigned long compute_effective_address(struct pt_regs *, unsigned int, unsigned int);
 
 static void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
                              unsigned int insn, int fault_code)
 {
+        unsigned long addr;
         siginfo_t info;
 
         info.si_code = code;
         info.si_signo = sig;
         info.si_errno = 0;
         if (fault_code & FAULT_CODE_ITLB)
-                info.si_addr = (void __user *) regs->tpc;
+                addr = regs->tpc;
         else
-                info.si_addr = (void __user *)
-                        compute_effective_address(regs, insn, 0);
+                addr = compute_effective_address(regs, insn, 0);
+        info.si_addr = (void __user *) addr;
         info.si_trapno = 0;
+
+        if (unlikely(show_unhandled_signals))
+                show_signal_msg(regs, sig, code, addr, current);
+
         force_sig_info(sig, &info, current);
 }
 
@@ -170,8 +192,9 @@ static unsigned int get_fault_insn(struct pt_regs *regs, unsigned int insn)
         return insn;
 }
 
-static void do_kernel_fault(struct pt_regs *regs, int si_code, int fault_code,
-                            unsigned int insn, unsigned long address)
+static void __kprobes do_kernel_fault(struct pt_regs *regs, int si_code,
+                                      int fault_code, unsigned int insn,
+                                      unsigned long address)
 {
         unsigned char asi = ASI_P;
  
@@ -225,7 +248,7 @@ cannot_handle:
         unhandled_fault (address, current, regs);
 }
 
-static void noinline bogus_32bit_fault_tpc(struct pt_regs *regs)
+static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
 {
         static int times;
 
@@ -237,8 +260,8 @@ static void noinline bogus_32bit_fault_tpc(struct pt_regs *regs)
         show_regs(regs);
 }
 
-static void noinline bogus_32bit_fault_address(struct pt_regs *regs,
-                                               unsigned long addr)
+static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
+                                                         unsigned long addr)
 {
         static int times;
 
@@ -302,6 +325,8 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
         if (in_atomic() || !mm)
                 goto intr_or_no_mm;
 
+        perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, 0, regs, address);
+
         if (!down_read_trylock(&mm->mmap_sem)) {
                 if ((regs->tstate & TSTATE_PRIV) &&
                     !search_exception_tables(regs->tpc)) {
@@ -406,11 +431,15 @@ good_area:
                         goto do_sigbus;
                 BUG();
         }
-        if (fault & VM_FAULT_MAJOR)
+        if (fault & VM_FAULT_MAJOR) {
                 current->maj_flt++;
-        else
+                perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, 0,
+                              regs, address);
+        } else {
                 current->min_flt++;
-
+                perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, 0,
+                              regs, address);
+        }
         up_read(&mm->mmap_sem);
 
         mm_rss = get_mm_rss(mm);
diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
index f27d10369e0c..5fdddf134caa 100644
--- a/arch/sparc/mm/hugetlbpage.c
+++ b/arch/sparc/mm/hugetlbpage.c
@@ -10,7 +10,6 @@
 #include <linux/mm.h>
 #include <linux/hugetlb.h>
 #include <linux/pagemap.h>
-#include <linux/slab.h>
 #include <linux/sysctl.h>
 
 #include <asm/mman.h>
diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index dc7c3b17a15f..6d0e02c4fe09 100644
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
@@ -24,6 +24,7 @@
 #include <linux/bootmem.h>
 #include <linux/pagemap.h>
 #include <linux/poison.h>
+#include <linux/gfp.h>
 
 #include <asm/sections.h>
 #include <asm/system.h>
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 1886d37d411b..b2831dc3c121 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -13,7 +13,6 @@
 #include <linux/bootmem.h>
 #include <linux/mm.h>
 #include <linux/hugetlb.h>
-#include <linux/slab.h>
 #include <linux/initrd.h>
 #include <linux/swap.h>
 #include <linux/pagemap.h>
@@ -26,6 +25,7 @@
 #include <linux/percpu.h>
 #include <linux/lmb.h>
 #include <linux/mmzone.h>
+#include <linux/gfp.h>
 
 #include <asm/head.h>
 #include <asm/system.h>
@@ -289,12 +289,13 @@ static void flush_dcache(unsigned long pfn)
         }
 }
 
-void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t pte)
+void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t *ptep)
 {
         struct mm_struct *mm;
         struct tsb *tsb;
         unsigned long tag, flags;
         unsigned long tsb_index, tsb_hash_shift;
+        pte_t pte = *ptep;
 
         if (tlb_type != hypervisor) {
                 unsigned long pfn = pte_pfn(pte);
@@ -2116,7 +2117,7 @@ int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node)
                                "node=%d entry=%lu/%lu\n", start, block, nr,
                                node,
                                addr >> VMEMMAP_CHUNK_SHIFT,
-                               VMEMMAP_SIZE >> VMEMMAP_CHUNK_SHIFT);
+                               VMEMMAP_SIZE);
                 }
         }
         return 0;
diff --git a/arch/sparc/mm/nosun4c.c b/arch/sparc/mm/nosun4c.c
index 196263f895b7..4e62c27147c4 100644
--- a/arch/sparc/mm/nosun4c.c
+++ b/arch/sparc/mm/nosun4c.c
@@ -62,7 +62,7 @@ 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 *ptep)
 {
 }
 
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index 509b1ffeba66..f5f75a58e0b3 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -10,7 +10,6 @@
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/pagemap.h>
 #include <linux/init.h>
@@ -20,6 +19,7 @@
 #include <linux/seq_file.h>
 #include <linux/kdebug.h>
 #include <linux/log2.h>
+#include <linux/gfp.h>
 
 #include <asm/bitext.h>
 #include <asm/page.h>
@@ -694,7 +694,7 @@ extern void tsunami_setup_blockops(void);
  * The following code is a deadwood that may be necessary when
  * we start to make precise page flushes again. --zaitcev
  */
-static void swift_update_mmu_cache(struct vm_area_struct * vma, unsigned long address, pte_t pte)
+static void swift_update_mmu_cache(struct vm_area_struct * vma, unsigned long address, pte_t *ptep)
 {
 #if 0
         static unsigned long last;
@@ -703,10 +703,10 @@ static void swift_update_mmu_cache(struct vm_area_struct * vma, unsigned long ad
 
         if (address == last) {
                 val = srmmu_hwprobe(address);
-                if (val != 0 && pte_val(pte) != val) {
+                if (val != 0 && pte_val(*ptep) != val) {
                         printk("swift_update_mmu_cache: "
                             "addr %lx put %08x probed %08x from %p\n",
-                            address, pte_val(pte), val,
+                            address, pte_val(*ptep), val,
                             __builtin_return_address(0));
                         srmmu_flush_whole_tlb();
                 }
@@ -1990,7 +1990,7 @@ void __init poke_leonsparc(void)
 void __init init_leon(void)
 {
 
-        srmmu_name = "Leon";
+        srmmu_name = "LEON";
 
         BTFIXUPSET_CALL(flush_cache_all, leon_flush_cache_all,
                         BTFIXUPCALL_NORM);
@@ -2037,8 +2037,6 @@ static void __init get_srmmu_type(void)
 
         /* First, check for sparc-leon. */
         if (sparc_cpu_model == sparc_leon) {
-                psr_typ = 0xf;  /* hardcoded ids for older models/simulators */
-                psr_vers = 2;
                 init_leon();
                 return;
         }
@@ -2301,7 +2299,8 @@ void __init ld_mmu_srmmu(void)
         BTFIXUPSET_CALL(flush_cache_mm, smp_flush_cache_mm, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(flush_cache_range, smp_flush_cache_range, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(flush_cache_page, smp_flush_cache_page, BTFIXUPCALL_NORM);
-        if (sparc_cpu_model != sun4d) {
+        if (sparc_cpu_model != sun4d &&
+            sparc_cpu_model != sparc_leon) {
                 BTFIXUPSET_CALL(flush_tlb_all, smp_flush_tlb_all, BTFIXUPCALL_NORM);
                 BTFIXUPSET_CALL(flush_tlb_mm, smp_flush_tlb_mm, BTFIXUPCALL_NORM);
                 BTFIXUPSET_CALL(flush_tlb_range, smp_flush_tlb_range, BTFIXUPCALL_NORM);
@@ -2330,6 +2329,8 @@ void __init ld_mmu_srmmu(void)
 #ifdef CONFIG_SMP
         if (sparc_cpu_model == sun4d)
                 sun4d_init_smp();
+        else if (sparc_cpu_model == sparc_leon)
+                leon_init_smp();
         else
                 sun4m_init_smp();
 #endif
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c
index 2ffacd67c424..cf38846753dd 100644
--- a/arch/sparc/mm/sun4c.c
+++ b/arch/sparc/mm/sun4c.c
@@ -12,11 +12,13 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/bootmem.h>
 #include <linux/highmem.h>
 #include <linux/fs.h>
 #include <linux/seq_file.h>
 #include <linux/scatterlist.h>
+#include <linux/bitmap.h>
 
 #include <asm/sections.h>
 #include <asm/page.h>
@@ -1021,20 +1023,12 @@ static char *sun4c_lockarea(char *vaddr, unsigned long size)
         npages = (((unsigned long)vaddr & ~PAGE_MASK) +
                   size + (PAGE_SIZE-1)) >> PAGE_SHIFT;
 
-        scan = 0;
         local_irq_save(flags);
-        for (;;) {
-                scan = find_next_zero_bit(sun4c_iobuffer_map,
-                                          iobuffer_map_size, scan);
-                if ((base = scan) + npages > iobuffer_map_size) goto abend;
-                for (;;) {
-                        if (scan >= base + npages) goto found;
-                        if (test_bit(scan, sun4c_iobuffer_map)) break;
-                        scan++;
-                }
-        }
+        base = bitmap_find_next_zero_area(sun4c_iobuffer_map, iobuffer_map_size,
+                                                0, npages, 0);
+        if (base >= iobuffer_map_size)
+                goto abend;
 
-found:
         high = ((base + npages) << PAGE_SHIFT) + sun4c_iobuffer_start;
         high = SUN4C_REAL_PGDIR_ALIGN(high);
         while (high > sun4c_iobuffer_high) {
@@ -1894,7 +1888,7 @@ static void sun4c_check_pgt_cache(int low, int high)
 /* An experiment, turn off by default for now... -DaveM */
 #define SUN4C_PRELOAD_PSEG
 
-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 *ptep)
 {
         unsigned long flags;
         int pseg;
@@ -1936,7 +1930,7 @@ void sun4c_update_mmu_cache(struct vm_area_struct *vma, unsigned long address, p
                         start += PAGE_SIZE;
                 }
 #ifndef SUN4C_PRELOAD_PSEG
-                sun4c_put_pte(address, pte_val(pte));
+                sun4c_put_pte(address, pte_val(*ptep));
 #endif
                 local_irq_restore(flags);
                 return;
@@ -1947,7 +1941,7 @@ void sun4c_update_mmu_cache(struct vm_area_struct *vma, unsigned long address, p
                 add_lru(entry);
         }
 
-        sun4c_put_pte(address, pte_val(pte));
+        sun4c_put_pte(address, pte_val(*ptep));
         local_irq_restore(flags);
 }
 
diff --git a/arch/sparc/mm/tsb.c b/arch/sparc/mm/tsb.c
index 36a0813f9517..101d7c82870b 100644
--- a/arch/sparc/mm/tsb.c
+++ b/arch/sparc/mm/tsb.c
@@ -5,6 +5,7 @@
 
 #include <linux/kernel.h>
 #include <linux/preempt.h>
+#include <linux/slab.h>
 #include <asm/system.h>
 #include <asm/page.h>
 #include <asm/tlbflush.h>