From: Michal Simek <monstr@monstr.eu>
Date: Tue, 22 Jun 2010 11:15:53 +0000 (+0200)
Subject: microblaze: Fix VM_ON and VM_OFF macros
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a4a94dbf20fa2e119cf89615ef21230f9b2f8913;p=linux-beck.git

microblaze: Fix VM_ON and VM_OFF macros

Jump behind macro. We don't want to execute nop instruction again.

Signed-off-by: Michal Simek <monstr@monstr.eu>
---

diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S
index 7a19d8910e3b..d40a59f9db4b 100644
--- a/arch/microblaze/kernel/entry.S
+++ b/arch/microblaze/kernel/entry.S
@@ -180,15 +180,17 @@
 
 /* turn on virtual protected mode save */
 #define VM_ON		\
-	set_ums;		\
+	set_ums;	\
 	rted	r0, 2f;	\
-2: nop;
+	nop; \
+2:
 
 /* turn off virtual protected mode save and user mode save*/
 #define VM_OFF			\
-	clear_vms_ums;			\
+	clear_vms_ums;		\
 	rted	r0, TOPHYS(1f);	\
-1: nop;
+	nop; \
+1:
 
 #define SAVE_REGS \
 	swi	r2, r1, PTO+PT_R2;	/* Save SDA */			\