From 715619d4c632bb51fcd837aac9b76bc38241c210 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Tue, 22 Jun 2010 13:15:53 +0200
Subject: [PATCH] --- yaml --- r: 204648 b: refs/heads/master c:
 a4a94dbf20fa2e119cf89615ef21230f9b2f8913 h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/arch/microblaze/kernel/entry.S | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8cef413118e2..a656f74469d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca28b510163a55df6260652056bfc60c4cf8aca1
+refs/heads/master: a4a94dbf20fa2e119cf89615ef21230f9b2f8913
diff --git a/trunk/arch/microblaze/kernel/entry.S b/trunk/arch/microblaze/kernel/entry.S
index 7a19d8910e3b..d40a59f9db4b 100644
--- a/trunk/arch/microblaze/kernel/entry.S
+++ b/trunk/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 */			\