summaryrefslogtreecommitdiff
path: root/arch/microblaze
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2010-06-22 16:00:35 (GMT)
committerMichal Simek <monstr@monstr.eu>2010-08-04 08:32:20 (GMT)
commite7741075b37e2be6693def1ff98487e3aef67874 (patch)
tree864ee02c000a245ca357b30484c07def30187e5b /arch/microblaze
parente5d2af2b96696420865a1644c94a0e79e34c6035 (diff)
downloadlinux-fsl-qoriq-e7741075b37e2be6693def1ff98487e3aef67874.tar.xz
microblaze: Do not mix register saving and mode setting
Separate reg saving and mode setting. Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze')
-rw-r--r--arch/microblaze/kernel/entry.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S
index cf4a0aa..8f6b4ee 100644
--- a/arch/microblaze/kernel/entry.S
+++ b/arch/microblaze/kernel/entry.S
@@ -293,9 +293,9 @@
tophys(r1,r1); \
addik r1, r1, -STATE_SAVE_SIZE; /* Make room on the stack. */\
SAVE_REGS \
- swi r0, r1, PTO + PT_MODE; /* Was in user-mode. */ \
lwi r11, r0, TOPHYS(PER_CPU(ENTRY_SP)); \
swi r11, r1, PTO+PT_R1; /* Store user SP. */ \
+ swi r0, r1, PTO + PT_MODE; /* Was in user-mode. */ \
/* MS: I am clearing UMS even in case when I come from kernel space */ \
clear_ums; \
2: lwi CURRENT_TASK, r0, TOPHYS(PER_CPU(CURRENT_SAVE));