diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-17 12:12:39 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-17 12:12:39 +0200 |
| commit | 7ac59c624992281ff315911dea2a98ca3f3ff06e (patch) | |
| tree | cef07b70e33f78cd184a05b16876756fb6e8a4ab /arch/ppc/kernel/entry.S | |
| parent | ppc: Use the merged of_device.c from arch/powerpc/kernel (diff) | |
| download | linux-7ac59c624992281ff315911dea2a98ca3f3ff06e.tar.xz linux-7ac59c624992281ff315911dea2a98ca3f3ff06e.zip | |
ppc: Fix various compile errors resulting from ptrace.c merge
This introduces flush_{fp,altivec,spe}_to_thread and fixes a
branch-too-far error in linking.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/kernel/entry.S')
| -rw-r--r-- | arch/ppc/kernel/entry.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S index 03d4886869f3..68fc61221776 100644 --- a/arch/ppc/kernel/entry.S +++ b/arch/ppc/kernel/entry.S @@ -633,7 +633,8 @@ sigreturn_exit: rlwinm r12,r1,0,0,18 /* current_thread_info() */ lwz r9,TI_FLAGS(r12) andi. r0,r9,_TIF_SYSCALL_T_OR_A - bnel- do_syscall_trace_leave + beq+ ret_from_except_full + bl do_syscall_trace_leave /* fall through */ .globl ret_from_except_full |