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;
 }