From 1b52f2cf8f255a813e7c96ac2333fe5bbbb0ac52 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 24 Sep 2007 16:40:56 +0900
Subject: [PATCH] --- yaml --- r: 68277 b: refs/heads/master c:
 8328a8ba92819792f37e3db002d404554e7a6f79 h: refs/heads/master i:   68275:
 26dac1063b83d0be8978c59fbc44fa7cbed8eb58 v: v3

---
 [refs]                         |  2 +-
 trunk/arch/sh/mm/Makefile      |  2 --
 trunk/arch/sh/mm/fault-nommu.c | 65 ----------------------------------
 3 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 trunk/arch/sh/mm/fault-nommu.c

diff --git a/[refs] b/[refs]
index c246e881348a..ea6d052e700e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d10040f7eb808cd984b563d1cf727a1020990a2e
+refs/heads/master: 8328a8ba92819792f37e3db002d404554e7a6f79
diff --git a/trunk/arch/sh/mm/Makefile b/trunk/arch/sh/mm/Makefile
index 6fbca50b64b4..ee30fb44dfe1 100644
--- a/trunk/arch/sh/mm/Makefile
+++ b/trunk/arch/sh/mm/Makefile
@@ -12,8 +12,6 @@ obj-$(CONFIG_SH7705_CACHE_32KB)	+= cache-sh7705.o
 endif
 
 mmu-y			:= tlb-nommu.o pg-nommu.o
-mmu-$(CONFIG_CPU_SH3)	+= fault-nommu.o
-mmu-$(CONFIG_CPU_SH4)	+= fault-nommu.o
 mmu-$(CONFIG_MMU)	:= fault.o clear_page.o copy_page.o tlb-flush.o	\
 			   ioremap.o
 
diff --git a/trunk/arch/sh/mm/fault-nommu.c b/trunk/arch/sh/mm/fault-nommu.c
deleted file mode 100644
index c7217c3f6969..000000000000
--- a/trunk/arch/sh/mm/fault-nommu.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * arch/sh/mm/fault-nommu.c
- *
- * Copyright (C) 2002 - 2007 Paul Mundt
- *
- * Based on linux/arch/sh/mm/fault.c:
- *  Copyright (C) 1999  Niibe Yutaka
- *
- * Released under the terms of the GNU GPL v2.0.
- */
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/hardirq.h>
-#include <linux/kprobes.h>
-#include <linux/signal.h>
-#include <asm/system.h>
-#include <asm/ptrace.h>
-#include <asm/kgdb.h>
-
-/*
- * This routine handles page faults.  It determines the address,
- * and the problem, and then passes it off to one of the appropriate
- * routines.
- */
-asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
-					unsigned long writeaccess,
-					unsigned long address)
-{
-	trace_hardirqs_on();
-	local_irq_enable();
-
-#if defined(CONFIG_SH_KGDB)
-	if (kgdb_nofault && kgdb_bus_err_hook)
-		kgdb_bus_err_hook();
-#endif
-
-	/*
-	 * Oops. The kernel tried to access some bad page. We'll have to
-	 * terminate things with extreme prejudice.
-	 *
-	 */
-	if (address < PAGE_SIZE) {
-		printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference");
-	} else {
-		printk(KERN_ALERT "Unable to handle kernel paging request");
-	}
-
-	printk(" at virtual address %08lx\n", address);
-	printk(KERN_ALERT "pc = %08lx\n", regs->pc);
-
-	die("Oops", regs, writeaccess);
-	do_exit(SIGKILL);
-}
-
-asmlinkage int __kprobes __do_page_fault(struct pt_regs *regs,
-					 unsigned long writeaccess,
-					 unsigned long address)
-{
-#if defined(CONFIG_SH_KGDB)
-	if (kgdb_nofault && kgdb_bus_err_hook)
-		kgdb_bus_err_hook();
-#endif
-
-	return (address >= TASK_SIZE);
-}