Skip to content

L
linux-davinci
Commit 8633bebc authored by Michal Simek's avatar Michal Simek
Browse files
Options

microblaze: Save current task directly 

Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
parent b1d70c62
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
arch/microblaze/kernel/entry.S
View file @ 8633bebc
...@@ -425,8 +425,7 @@ C_ENTRY(ret_from_trap): ...@@ -425,8 +425,7 @@ C_ENTRY(ret_from_trap):
lwi r4, r1, PTO + PT_R4; lwi r4, r1, PTO + PT_R4;
swi r0, r0, PER_CPU(KM); /* Now officially in user state. */ swi r0, r0, PER_CPU(KM); /* Now officially in user state. */
add r11, r0, CURRENT_TASK; /* Get current task ptr into r11 */ swi CURRENT_TASK, r0, PER_CPU(CURRENT_SAVE); /* save current */
swi r11, r0, PER_CPU(CURRENT_SAVE); /* save current */
VM_OFF; VM_OFF;
tophys(r1,r1); tophys(r1,r1);
RESTORE_REGS; RESTORE_REGS;
...@@ -700,8 +699,7 @@ C_ENTRY(ret_from_exc): ...@@ -700,8 +699,7 @@ C_ENTRY(ret_from_exc):
/* Finally, return to user state. */ /* Finally, return to user state. */
1: swi r0, r0, PER_CPU(KM); /* Now officially in user state. */ 1: swi r0, r0, PER_CPU(KM); /* Now officially in user state. */
add r11, r0, CURRENT_TASK; /* Get current task ptr into r11 */ swi CURRENT_TASK, r0, PER_CPU(CURRENT_SAVE); /* save current */
swi r11, r0, PER_CPU(CURRENT_SAVE); /* save current */
VM_OFF; VM_OFF;
tophys(r1,r1); tophys(r1,r1);
...@@ -828,8 +826,7 @@ no_intr_resched: ...@@ -828,8 +826,7 @@ no_intr_resched:
/* Disable interrupts, we are now committed to the state restore */ /* Disable interrupts, we are now committed to the state restore */
disable_irq disable_irq
swi r0, r0, PER_CPU(KM); /* MS: Now officially in user state. */ swi r0, r0, PER_CPU(KM); /* MS: Now officially in user state. */
add r11, r0, CURRENT_TASK; swi CURRENT_TASK, r0, PER_CPU(CURRENT_SAVE);
swi r11, r0, PER_CPU(CURRENT_SAVE);
VM_OFF; VM_OFF;
tophys(r1,r1); tophys(r1,r1);
lwi r3, r1, PTO + PT_R3; /* MS: restore saved r3, r4 registers */ lwi r3, r1, PTO + PT_R3; /* MS: restore saved r3, r4 registers */
...@@ -979,8 +976,7 @@ dbtrap_call: rtbd r11, 0; ...@@ -979,8 +976,7 @@ dbtrap_call: rtbd r11, 0;
/* Finally, return to user state. */ /* Finally, return to user state. */
1: swi r0, r0, PER_CPU(KM); /* Now officially in user state. */ 1: swi r0, r0, PER_CPU(KM); /* Now officially in user state. */
add r11, r0, CURRENT_TASK; /* Get current task ptr into r11 */ swi CURRENT_TASK, r0, PER_CPU(CURRENT_SAVE); /* save current */
swi r11, r0, PER_CPU(CURRENT_SAVE); /* save current */
VM_OFF; VM_OFF;
tophys(r1,r1); tophys(r1,r1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment