From 9566b6db8075706efc4fdc767d70d9457bcb2871 Mon Sep 17 00:00:00 2001
From: Thiemo Seufer <ths@networkno.de>
Date: Mon, 21 Feb 2005 11:44:31 +0000
Subject: [PATCH] --- yaml --- r: 11014 b: refs/heads/master c:
 049b13c358f0187cf3c5003d5fb9848dbcb28bc3 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/include/asm-mips/io.h | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3b1b8dab1fd6..4815fe7032ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f83d839dfd2dbe421224c29f02cef77f5b4b875
+refs/heads/master: 049b13c358f0187cf3c5003d5fb9848dbcb28bc3
diff --git a/trunk/include/asm-mips/io.h b/trunk/include/asm-mips/io.h
index 039845f2e6b0..1f2fe11f4124 100644
--- a/trunk/include/asm-mips/io.h
+++ b/trunk/include/asm-mips/io.h
@@ -319,7 +319,8 @@ static inline type pfx##read##bwlq(volatile void __iomem *mem)		\
 	else if (cpu_has_64bits) {					\
 		unsigned long __flags;					\
 									\
-		local_irq_save(__flags);				\
+		if (irq)						\
+			local_irq_save(__flags);			\
 		__asm__ __volatile__(					\
 			".set	mips3"		"\t\t# __readq"	"\n\t"	\
 			"ld	%L0, %1"			"\n\t"	\
@@ -328,7 +329,8 @@ static inline type pfx##read##bwlq(volatile void __iomem *mem)		\
 			".set	mips0"				"\n"	\
 			: "=r" (__val)					\
 			: "m" (*__mem));				\
-		local_irq_restore(__flags);				\
+		if (irq)						\
+			local_irq_restore(__flags);			\
 	} else {							\
 		__val = 0;						\
 		BUG();							\