From d316f0e7a7112f06477577e267ce0039f42a29b9 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Thu, 4 Nov 2010 16:00:44 +1000
Subject: [PATCH] --- yaml --- r: 231815 b: refs/heads/master c:
 bb4edc5e4478db21147f86b6682704bfc1125c55 h: refs/heads/master i:   231813:
 d7f86b995d40ac4fd80117c1f3e8800d59a787e8   231811:
 5e33fc62f3669393c28aea25819e90d7b30aeb3b   231807:
 7b237b1860a0ef95c60d98a9525de8e14a414fef v: v3

---
 [refs]                           |  2 +-
 trunk/arch/m68knommu/mm/Makefile |  2 +-
 trunk/arch/m68knommu/mm/fault.c  | 57 --------------------------------
 3 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100644 trunk/arch/m68knommu/mm/fault.c

diff --git a/[refs] b/[refs]
index 1d2f99d59418..1ae8f1d385f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c83af5f9d7e15a091f11394ad5916a7dcf1a99e
+refs/heads/master: bb4edc5e4478db21147f86b6682704bfc1125c55
diff --git a/trunk/arch/m68knommu/mm/Makefile b/trunk/arch/m68knommu/mm/Makefile
index fc91f254f51b..7b3e4002373b 100644
--- a/trunk/arch/m68knommu/mm/Makefile
+++ b/trunk/arch/m68knommu/mm/Makefile
@@ -2,4 +2,4 @@
 # Makefile for the linux m68knommu specific parts of the memory manager.
 #
 
-obj-y += init.o fault.o memory.o kmap.o
+obj-y += init.o memory.o kmap.o
diff --git a/trunk/arch/m68knommu/mm/fault.c b/trunk/arch/m68knommu/mm/fault.c
deleted file mode 100644
index bc05cf74d9c0..000000000000
--- a/trunk/arch/m68knommu/mm/fault.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  linux/arch/m68knommu/mm/fault.c
- *
- *  Copyright (C) 1998  D. Jeff Dionne <jeff@lineo.ca>,
- *  Copyright (C) 2000  Lineo, Inc.  (www.lineo.com)
- *
- *  Based on:
- *
- *  linux/arch/m68k/mm/fault.c
- *
- *  Copyright (C) 1995  Hamish Macdonald
- */
-
-#include <linux/mman.h>
-#include <linux/mm.h>
-#include <linux/kernel.h>
-#include <linux/ptrace.h>
-
-#include <asm/system.h>
-#include <asm/pgtable.h>
-
-extern void die_if_kernel(char *, struct pt_regs *, long);
-
-/*
- * This routine handles page faults.  It determines the problem, and
- * then passes it off to one of the appropriate routines.
- *
- * error_code:
- *	bit 0 == 0 means no page found, 1 means protection fault
- *	bit 1 == 0 means read, 1 means write
- *
- * If this routine detects a bad access, it returns 1, otherwise it
- * returns 0.
- */
-asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address,
-			      unsigned long error_code)
-{
-#ifdef DEBUG
-	printk(KERN_DEBUG "regs->sr=%#x, regs->pc=%#lx, address=%#lx, %ld\n",
-		regs->sr, regs->pc, address, error_code);
-#endif
-
-	/*
-	 * Oops. The kernel tried to access some bad page. We'll have to
-	 * terminate things with extreme prejudice.
-	 */
-	if ((unsigned long) address < PAGE_SIZE)
-		printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference");
-	else
-		printk(KERN_ALERT "Unable to handle kernel access");
-	printk(KERN_ALERT " at virtual address %08lx\n", address);
-	die_if_kernel("Oops", regs, error_code);
-	do_exit(SIGKILL);
-
-	return 1;
-}
-