diff options
Diffstat (limited to 'arch/mn10300/kernel/switch_to.S')
-rw-r--r-- | arch/mn10300/kernel/switch_to.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/mn10300/kernel/switch_to.S b/arch/mn10300/kernel/switch_to.S index 630aad71b946..9074d0fb8788 100644 --- a/arch/mn10300/kernel/switch_to.S +++ b/arch/mn10300/kernel/switch_to.S | |||
@@ -15,6 +15,9 @@ | |||
15 | #include <linux/linkage.h> | 15 | #include <linux/linkage.h> |
16 | #include <asm/thread_info.h> | 16 | #include <asm/thread_info.h> |
17 | #include <asm/cpu-regs.h> | 17 | #include <asm/cpu-regs.h> |
18 | #ifdef CONFIG_SMP | ||
19 | #include <proc/smp-regs.h> | ||
20 | #endif /* CONFIG_SMP */ | ||
18 | 21 | ||
19 | .text | 22 | .text |
20 | 23 | ||
@@ -35,8 +38,6 @@ ENTRY(__switch_to) | |||
35 | mov d1,a1 | 38 | mov d1,a1 |
36 | 39 | ||
37 | # save prev context | 40 | # save prev context |
38 | mov (__frame),d0 | ||
39 | mov d0,(THREAD_FRAME,a0) | ||
40 | mov __switch_back,d0 | 41 | mov __switch_back,d0 |
41 | mov d0,(THREAD_PC,a0) | 42 | mov d0,(THREAD_PC,a0) |
42 | mov sp,a2 | 43 | mov sp,a2 |
@@ -58,8 +59,6 @@ ENTRY(__switch_to) | |||
58 | mov a2,e2 | 59 | mov a2,e2 |
59 | #endif | 60 | #endif |
60 | 61 | ||
61 | mov (THREAD_FRAME,a1),a2 | ||
62 | mov a2,(__frame) | ||
63 | mov (THREAD_PC,a1),a2 | 62 | mov (THREAD_PC,a1),a2 |
64 | mov d2,d0 # for ret_from_fork | 63 | mov d2,d0 # for ret_from_fork |
65 | mov d0,a0 # for __switch_to | 64 | mov d0,a0 # for __switch_to |