diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /arch/sparc64/kernel/sys32.S | |
parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) |
Merge ../linux-2.6
Diffstat (limited to 'arch/sparc64/kernel/sys32.S')
-rw-r--r-- | arch/sparc64/kernel/sys32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/sys32.S b/arch/sparc64/kernel/sys32.S index 60b59375aa78..c4a1cef4b1e5 100644 --- a/arch/sparc64/kernel/sys32.S +++ b/arch/sparc64/kernel/sys32.S | |||
@@ -318,7 +318,7 @@ do_sys_recvmsg: /* compat_sys_recvmsg(int, struct compat_msghdr *, unsigned int) | |||
318 | nop | 318 | nop |
319 | nop | 319 | nop |
320 | 320 | ||
321 | .section __ex_table | 321 | .section __ex_table,"a" |
322 | .align 4 | 322 | .align 4 |
323 | .word 1b, __retl_efault, 2b, __retl_efault | 323 | .word 1b, __retl_efault, 2b, __retl_efault |
324 | .word 3b, __retl_efault, 4b, __retl_efault | 324 | .word 3b, __retl_efault, 4b, __retl_efault |