]> git.karo-electronics.de Git - linux-beck.git/commitdiff
microblaze: Fix VM_ON and VM_OFF macros
authorMichal Simek <monstr@monstr.eu>
Tue, 22 Jun 2010 11:15:53 +0000 (13:15 +0200)
committerMichal Simek <monstr@monstr.eu>
Wed, 4 Aug 2010 08:22:42 +0000 (10:22 +0200)
Jump behind macro. We don't want to execute nop instruction again.

Signed-off-by: Michal Simek <monstr@monstr.eu>
arch/microblaze/kernel/entry.S

index 7a19d8910e3ba107ccca3d37fb1f3afd38b98c40..d40a59f9db4b722823490963764d6a5d15bd5eb9 100644 (file)
 
 /* 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 */                  \