diff options
author | Michal Simek <monstr@monstr.eu> | 2010-06-22 07:15:53 -0400 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2010-08-04 04:22:42 -0400 |
commit | a4a94dbf20fa2e119cf89615ef21230f9b2f8913 (patch) | |
tree | 8c38c31068e8460639d0fd62942ba0b3712c3f1a /arch | |
parent | ca28b510163a55df6260652056bfc60c4cf8aca1 (diff) |
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')
-rw-r--r-- | arch/microblaze/kernel/entry.S | 10 |
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 @@ | |||
180 | 180 | ||
181 | /* turn on virtual protected mode save */ | 181 | /* turn on virtual protected mode save */ |
182 | #define VM_ON \ | 182 | #define VM_ON \ |
183 | set_ums; \ | 183 | set_ums; \ |
184 | rted r0, 2f; \ | 184 | rted r0, 2f; \ |
185 | 2: nop; | 185 | nop; \ |
186 | 2: | ||
186 | 187 | ||
187 | /* turn off virtual protected mode save and user mode save*/ | 188 | /* turn off virtual protected mode save and user mode save*/ |
188 | #define VM_OFF \ | 189 | #define VM_OFF \ |
189 | clear_vms_ums; \ | 190 | clear_vms_ums; \ |
190 | rted r0, TOPHYS(1f); \ | 191 | rted r0, TOPHYS(1f); \ |
191 | 1: nop; | 192 | nop; \ |
193 | 1: | ||
192 | 194 | ||
193 | #define SAVE_REGS \ | 195 | #define SAVE_REGS \ |
194 | swi r2, r1, PTO+PT_R2; /* Save SDA */ \ | 196 | swi r2, r1, PTO+PT_R2; /* Save SDA */ \ |