diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 08:43:13 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 08:43:13 -0700 |
commit | c4a7c77fcb8c0ef16e7193fb8cab2654282bbfab (patch) | |
tree | ca3a211950c7511609ba3f01ec11831d90882f22 /arch/sparc64/kernel/head.S | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | [RADEON]: Fix unaligned I/O port access during probe. (diff) | |
download | linux-dev-c4a7c77fcb8c0ef16e7193fb8cab2654282bbfab.tar.xz linux-dev-c4a7c77fcb8c0ef16e7193fb8cab2654282bbfab.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc64/kernel/head.S')
-rw-r--r-- | arch/sparc64/kernel/head.S | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S index ecc748fb9ad7..89406f9649a9 100644 --- a/arch/sparc64/kernel/head.S +++ b/arch/sparc64/kernel/head.S @@ -540,8 +540,11 @@ bootup_user_stack_end: prom_tba: .xword 0 tlb_type: .word 0 /* Must NOT end up in BSS */ .section ".fixup",#alloc,#execinstr - .globl __ret_efault + + .globl __ret_efault, __retl_efault __ret_efault: ret restore %g0, -EFAULT, %o0 - +__retl_efault: + retl + mov -EFAULT, %o0 |