summaryrefslogtreecommitdiff
path: root/arch/microblaze
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2010-06-22 15:15:53 +0400
committerMichal Simek <monstr@monstr.eu>2010-08-04 12:22:42 +0400
commita4a94dbf20fa2e119cf89615ef21230f9b2f8913 (patch)
tree8c38c31068e8460639d0fd62942ba0b3712c3f1a /arch/microblaze
parentca28b510163a55df6260652056bfc60c4cf8aca1 (diff)
downloadlinux-a4a94dbf20fa2e119cf89615ef21230f9b2f8913.tar.xz
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>
Diffstat (limited to 'arch/microblaze')
-rw-r--r--arch/microblaze/kernel/entry.S10
1 files changed, 6 insertions, 4 deletions
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 */ \