From a9097039b732c0c3564702ffaa2f5b64b73d50bf Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sat, 3 Jun 2006 21:59:51 +0100
Subject: [PATCH] --- yaml --- r: 27661 b: refs/heads/master c:
 1bd5e16168b58e73f7be432ba3558af9d38662cf h: refs/heads/master i:   27659:
 b9bfd4f995dcbbfd6fc1357ad8f1807040629fe8 v: v3

---
 [refs]                            | 2 +-
 trunk/include/asm-mips/mipsregs.h | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6b073d5c1331..6dec5a8992fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0589f1ecea73e7bce09c569dca44b83e68a39b1
+refs/heads/master: 1bd5e16168b58e73f7be432ba3558af9d38662cf
diff --git a/trunk/include/asm-mips/mipsregs.h b/trunk/include/asm-mips/mipsregs.h
index 5af7517fce8a..98b68089aa53 100644
--- a/trunk/include/asm-mips/mipsregs.h
+++ b/trunk/include/asm-mips/mipsregs.h
@@ -1451,12 +1451,10 @@ static inline void __emt(unsigned int previous)
 {
 	if ((previous & __EMT_ENABLE))
 		__asm__ __volatile__(
-		"	.set	noreorder				\n"
 		"	.set	mips32r2				\n"
 		"	.word	0x41600be1		# emt		\n"
 		"	ehb						\n"
-		"	.set	mips0					\n"
-		"	.set	reorder					\n");
+		"	.set	mips0					\n");
 }
 
 static inline void __ehb(void)