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, 1 insertions, 1 deletions

diff --git a/arch/mn10300/kernel/asm-offsets.c b/arch/mn10300/kernel/asm-offsets.c
index 54cc5b6b13f2..96f24fab7de6 100644
--- a/arch/mn10300/kernel/asm-offsets.c
+++ b/arch/mn10300/kernel/asm-offsets.c
@@ -23,6 +23,7 @@ void foo(void)
 
         OFFSET(TI_task,                 thread_info, task);
         OFFSET(TI_exec_domain,          thread_info, exec_domain);
+        OFFSET(TI_frame,                thread_info, frame);
         OFFSET(TI_flags,                thread_info, flags);
         OFFSET(TI_cpu,                  thread_info, cpu);
         OFFSET(TI_preempt_count,        thread_info, preempt_count);
@@ -66,7 +67,6 @@ void foo(void)
         OFFSET(THREAD_SP,               thread_struct, sp);
         OFFSET(THREAD_A3,               thread_struct, a3);
         OFFSET(THREAD_USP,              thread_struct, usp);
-        OFFSET(THREAD_FRAME,            thread_struct, frame);
 #ifdef CONFIG_FPU
         OFFSET(THREAD_FPU_FLAGS,        thread_struct, fpu_flags);
         OFFSET(THREAD_FPU_STATE,        thread_struct, fpu_state);