From e946b22f75d3b8d35e1f0f09060f258944425b4f Mon Sep 17 00:00:00 2001
From: Jack Steiner <steiner@sgi.com>
Date: Tue, 15 Dec 2009 16:48:15 -0800
Subject: [PATCH] --- yaml --- r: 176743 b: refs/heads/master c:
 54465dcc035b2b55aa4d8130fa6d9410437f7d8d h: refs/heads/master i:   176741:
 731711ca5008014f7033ea7dcdcb3d917f553af2   176739:
 231e1526fefc17a3c29aeab4daf8a01f7a44c743   176735:
 88da300ff249dcc8b14dd783a7cb21a2d11685f6 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/misc/sgi-gru/grufault.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fb777637b18c..9cf648152ded 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c13cb331f7054d537d4caa094d3ebbba544833a
+refs/heads/master: 54465dcc035b2b55aa4d8130fa6d9410437f7d8d
diff --git a/trunk/drivers/misc/sgi-gru/grufault.c b/trunk/drivers/misc/sgi-gru/grufault.c
index 3e644042c805..b56009f9203a 100644
--- a/trunk/drivers/misc/sgi-gru/grufault.c
+++ b/trunk/drivers/misc/sgi-gru/grufault.c
@@ -253,7 +253,6 @@ static int atomic_pte_lookup(struct vm_area_struct *vma, unsigned long vaddr,
 	return 0;
 
 err:
-	local_irq_enable();
 	return 1;
 }