| From d4f295b7863f094b4d76ce10cb99f4617b5d00ad Mon Sep 17 00:00:00 2001 |
| From: Tkhai Kirill <tkhai@yandex.ru> |
| Date: Thu, 31 Mar 2011 00:52:38 -0700 |
| Subject: sparc32: Pass task_struct to schedule_tail() in ret_from_fork |
| |
| |
| From: Tkhai Kirill <tkhai@yandex.ru> |
| |
| [ Upstream commit 47c7c97a93a5b8f719093dbf83555090b3b8228b ] |
| |
| We have to pass task_struct of previous process to function |
| schedule_tail(). Currently in ret_from_fork previous thread_info |
| is passed: |
| |
| switch_to: mov %g6, %g3 /* previous thread_info in g6 */ |
| |
| ret_from_fork: call schedule_tail |
| mov %g3, %o0 /* previous thread_info is passed */ |
| |
| void schedule_tail(struct task_struct *prev); |
| |
| Signed-off-by: Tkhai Kirill <tkhai@yandex.ru> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| arch/sparc/kernel/entry.S | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/sparc/kernel/entry.S |
| +++ b/arch/sparc/kernel/entry.S |
| @@ -1283,7 +1283,7 @@ linux_syscall_trace: |
| .globl ret_from_fork |
| ret_from_fork: |
| call schedule_tail |
| - mov %g3, %o0 |
| + ld [%g3 + TI_TASK], %o0 |
| b ret_sys_call |
| ld [%sp + STACKFRAME_SZ + PT_I0], %o0 |
| |