1 files changed, 0 insertions, 89 deletions

diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
index f3e6921712bb..734812105266 100644
--- a/arch/sparc/mm/fault_32.c
+++ b/arch/sparc/mm/fault_32.c
@@ -24,7 +24,6 @@
 
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <asm/memreg.h>
 #include <asm/openprom.h>
 #include <asm/oplib.h>
 #include <asm/smp.h>
@@ -70,8 +69,6 @@ asmlinkage void sparc_lvl15_nmi(struct pt_regs *regs, unsigned long serr,
         printk("       Synchronous Vaddr %08lx\n", svaddr);
         printk("      Asynchronous Error %08lx\n", aerr);
         printk("      Asynchronous Vaddr %08lx\n", avaddr);
-        if (sun4c_memerr_reg)
-                printk("     Memory Parity Error %08lx\n", *sun4c_memerr_reg);
         printk("REGISTER DUMP:\n");
         show_regs(regs);
         prom_halt();
@@ -422,92 +419,6 @@ vmalloc_fault:
         }
 }
 
-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 *);
-        extern pte_t *sun4c_pte_offset_kernel(pmd_t *,unsigned long);
-        struct task_struct *tsk = current;
-        struct mm_struct *mm = tsk->mm;
-        pgd_t *pgdp;
-        pte_t *ptep;
-
-        if (text_fault) {
-                address = regs->pc;
-        } else if (!write &&
-                   !(regs->psr & PSR_PS)) {
-                unsigned int insn, __user *ip;
-
-                ip = (unsigned int __user *)regs->pc;
-                if (!get_user(insn, ip)) {
-                        if ((insn & 0xc1680000) == 0xc0680000)
-                                write = 1;
-                }
-        }
-
-        if (!mm) {
-                /* We are oopsing. */
-                do_sparc_fault(regs, text_fault, write, address);
-                BUG();  /* P3 Oops already, you bitch */
-        }
-
-        pgdp = pgd_offset(mm, address);
-        ptep = sun4c_pte_offset_kernel((pmd_t *) pgdp, address);
-
-        if (pgd_val(*pgdp)) {
-            if (write) {
-                if ((pte_val(*ptep) & (_SUN4C_PAGE_WRITE|_SUN4C_PAGE_PRESENT))
-                                   == (_SUN4C_PAGE_WRITE|_SUN4C_PAGE_PRESENT)) {
-                        unsigned long flags;
-
-                        *ptep = __pte(pte_val(*ptep) | _SUN4C_PAGE_ACCESSED |
-                                      _SUN4C_PAGE_MODIFIED |
-                                      _SUN4C_PAGE_VALID |
-                                      _SUN4C_PAGE_DIRTY);
-
-                        local_irq_save(flags);
-                        if (sun4c_get_segmap(address) != invalid_segment) {
-                                sun4c_put_pte(address, pte_val(*ptep));
-                                local_irq_restore(flags);
-                                return;
-                        }
-                        local_irq_restore(flags);
-                }
-            } else {
-                if ((pte_val(*ptep) & (_SUN4C_PAGE_READ|_SUN4C_PAGE_PRESENT))
-                                   == (_SUN4C_PAGE_READ|_SUN4C_PAGE_PRESENT)) {
-                        unsigned long flags;
-
-                        *ptep = __pte(pte_val(*ptep) | _SUN4C_PAGE_ACCESSED |
-                                      _SUN4C_PAGE_VALID);
-
-                        local_irq_save(flags);
-                        if (sun4c_get_segmap(address) != invalid_segment) {
-                                sun4c_put_pte(address, pte_val(*ptep));
-                                local_irq_restore(flags);
-                                return;
-                        }
-                        local_irq_restore(flags);
-                }
-            }
-        }
-
-        /* This conditional is 'interesting'. */
-        if (pgd_val(*pgdp) && !(write && !(pte_val(*ptep) & _SUN4C_PAGE_WRITE))
-            && (pte_val(*ptep) & _SUN4C_PAGE_VALID))
-                /* Note: It is safe to not grab the MMAP semaphore here because
-                 *       we know that update_mmu_cache() will not sleep for
-                 *       any reason (at least not in the current implementation)
-                 *       and therefore there is no danger of another thread getting
-                 *       on the CPU and doing a shrink_mmap() on this vma.
-                 */
-                sun4c_update_mmu_cache (find_vma(current->mm, address), address,
-                                        ptep);
-        else
-                do_sparc_fault(regs, text_fault, write, address);
-}
-
 /* This always deals with user addresses. */
 static void force_user_fault(unsigned long address, int write)
 {