From 80f0497b824d5c824e8c263b24db46d29895cfa9 Mon Sep 17 00:00:00 2001
From: Hirokazu Takata <takata@linux-m32r.org>
Date: Fri, 8 Dec 2006 02:35:56 -0800
Subject: [PATCH] --- yaml --- r: 43485 b: refs/heads/master c:
 6b8bd3f4b2e9d0fbfd0e7d75ba1cdc79c6876ecc h: refs/heads/master i:   43483:
 d1b9b8ca3ec560f6c93f616a7b370c81f79a10f1 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/m32r/kernel/entry.S | 2 --
 trunk/arch/m32r/mm/fault.c     | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8e93834ece23..4440b5e75fbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f894cb5c938de467e208e5934c90cb9deee7dc46
+refs/heads/master: 6b8bd3f4b2e9d0fbfd0e7d75ba1cdc79c6876ecc
diff --git a/trunk/arch/m32r/kernel/entry.S b/trunk/arch/m32r/kernel/entry.S
index 5b01fd2096fc..a2c472c0549f 100644
--- a/trunk/arch/m32r/kernel/entry.S
+++ b/trunk/arch/m32r/kernel/entry.S
@@ -596,8 +596,6 @@ ENTRY(ace_handler)
 	beqz	r1, inst
 oprand:
 	ld	r2, @(low(MDEVA_offset),r2)	; set address
-	srli	r2, #12
-	slli	r2, #12
 	srli	r1, #1
 	bra	1f
 inst:
diff --git a/trunk/arch/m32r/mm/fault.c b/trunk/arch/m32r/mm/fault.c
index 8d5f551b5754..9b9feb0f1610 100644
--- a/trunk/arch/m32r/mm/fault.c
+++ b/trunk/arch/m32r/mm/fault.c
@@ -173,7 +173,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code,
 		goto good_area;
 	if (!(vma->vm_flags & VM_GROWSDOWN))
 		goto bad_area;
-#if 0
+
 	if (error_code & ACE_USERMODE) {
 		/*
 		 * accessing the stack below "spu" is always a bug.
@@ -184,7 +184,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code,
 		if (address + 4 < regs->spu)
 			goto bad_area;
 	}
-#endif
+
 	if (expand_stack(vma, address))
 		goto bad_area;
 /*