MN10300: Save frame pointer in thread_info struct rather than global var

Save the current exception frame pointer in the thread_info struct rather than
in a global variable as the latter makes SMP tricky, especially when preemption
is also enabled.

This also replaces __frame with current_frame() and rearranges header file
inclusions to make it all compile.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Akira Takeuchi <takeuchi.akr@jp.panasonic.com>

1 files changed, 0 insertions, 18 deletions

diff --git a/arch/mn10300/kernel/switch_to.S b/arch/mn10300/kernel/switch_to.S
index b08cb2e3aebd..9074d0fb8788 100644
--- a/arch/mn10300/kernel/switch_to.S
+++ b/arch/mn10300/kernel/switch_to.S
@@ -38,15 +38,6 @@ ENTRY(__switch_to)
         mov     d1,a1
 
         # save prev context
-#ifdef CONFIG_SMP
-        mov     (CPUID),a2
-        add     a2,a2
-        add     a2,a2
-        mov     (___frame,a2),d0
-#else  /* CONFIG_SMP */
-        mov     (__frame),d0
-#endif /* CONFIG_SMP */
-        mov     d0,(THREAD_FRAME,a0)
         mov     __switch_back,d0
         mov     d0,(THREAD_PC,a0)
         mov     sp,a2
@@ -68,15 +59,6 @@ ENTRY(__switch_to)
         mov     a2,e2
 #endif
 
-        mov     (THREAD_FRAME,a1),a2
-#ifdef CONFIG_SMP
-        mov     (CPUID),a0
-        add     a0,a0
-        add     a0,a0
-        mov     a2,(___frame,a0)
-#else  /* CONFIG_SMP */
-        mov     a2,(__frame)
-#endif /* CONFIG_SMP */
         mov     (THREAD_PC,a1),a2
         mov     d2,d0                   # for ret_from_fork
         mov     d0,a0                   # for __switch_to