From fbef1ddafa723fe66c0d216ab1712b239192cfb9 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 12 Nov 2008 15:35:25 +0000
Subject: [PATCH] --- yaml --- r: 118849 b: refs/heads/master c:
 aefefbbec1ad25bafa97a7a1db25313ce26563e2 h: refs/heads/master i:   118847:
 c09381f54c05105b6b94b2ccc665006ff203b1cd v: v3

---
 [refs]                               | 2 +-
 trunk/arch/mn10300/mm/misalignment.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0ef13fc391fb..15401ba9ef80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f911c685d65ea1855eb3f95b8eaf871e5d9342fa
+refs/heads/master: aefefbbec1ad25bafa97a7a1db25313ce26563e2
diff --git a/trunk/arch/mn10300/mm/misalignment.c b/trunk/arch/mn10300/mm/misalignment.c
index 066ddc625a14..05a3c2f8d2df 100644
--- a/trunk/arch/mn10300/mm/misalignment.c
+++ b/trunk/arch/mn10300/mm/misalignment.c
@@ -314,9 +314,6 @@ asmlinkage void misalignment(struct pt_regs *regs, enum exception_code code)
 
 	kdebug("==>misalignment({pc=%lx})", regs->pc);
 
-	if (in_interrupt())
-		die("Misalignment trap in interrupt context", regs, code);
-
 	if (regs->epsw & EPSW_IE)
 		asm volatile("or %0,epsw" : : "i"(EPSW_IE));