diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-03-05 02:23:56 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-03-05 02:23:56 -0500 |
| commit | 4d000d5b9689734006d89fe9b7597c758b74a9fb (patch) | |
| tree | 1336c7805645b29eec0617b4554e5e0b37222123 /arch | |
| parent | 501f74f29498543c27f4f9697f5c1e980dd2de0d (diff) | |
[SPARC64]: Mark __ex_table section correctly.
We must use the "a" (allocate) attribute every time we
emit an entry into the __ex_table section.
For consistency, use "a" instead of #alloc which is some
Solaris compat cruft GNU as provides on Sparc.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc64/kernel/sys32.S | 2 | ||||
| -rw-r--r-- | arch/sparc64/kernel/una_asm.S | 4 | ||||
| -rw-r--r-- | arch/sparc64/lib/U1copy_from_user.S | 2 | ||||
| -rw-r--r-- | arch/sparc64/lib/U1copy_to_user.S | 2 | ||||
| -rw-r--r-- | arch/sparc64/lib/U3copy_from_user.S | 2 | ||||
| -rw-r--r-- | arch/sparc64/lib/U3copy_to_user.S | 2 | ||||
| -rw-r--r-- | arch/sparc64/lib/bzero.S | 2 | ||||
| -rw-r--r-- | arch/sparc64/lib/copy_in_user.S | 2 | ||||
| -rw-r--r-- | arch/sparc64/lib/csum_copy_from_user.S | 2 | ||||
| -rw-r--r-- | arch/sparc64/lib/csum_copy_to_user.S | 2 | ||||
| -rw-r--r-- | arch/sparc64/lib/strlen_user.S | 2 | ||||
| -rw-r--r-- | arch/sparc64/lib/strncpy_from_user.S | 2 | ||||
| -rw-r--r-- | arch/sparc64/solaris/entry64.S | 2 |
13 files changed, 14 insertions, 14 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 |
diff --git a/arch/sparc64/kernel/una_asm.S b/arch/sparc64/kernel/una_asm.S index 1f5b5b708ce7..be183fe41443 100644 --- a/arch/sparc64/kernel/una_asm.S +++ b/arch/sparc64/kernel/una_asm.S | |||
| @@ -47,7 +47,7 @@ __do_int_store: | |||
| 47 | mov 0, %o0 | 47 | mov 0, %o0 |
| 48 | .size __do_int_store, .-__do_int_store | 48 | .size __do_int_store, .-__do_int_store |
| 49 | 49 | ||
| 50 | .section __ex_table | 50 | .section __ex_table,"a" |
| 51 | .word 4b, __retl_efault | 51 | .word 4b, __retl_efault |
| 52 | .word 5b, __retl_efault | 52 | .word 5b, __retl_efault |
| 53 | .word 6b, __retl_efault | 53 | .word 6b, __retl_efault |
| @@ -129,7 +129,7 @@ do_int_load: | |||
| 129 | mov 0, %o0 | 129 | mov 0, %o0 |
| 130 | .size __do_int_load, .-__do_int_load | 130 | .size __do_int_load, .-__do_int_load |
| 131 | 131 | ||
| 132 | .section __ex_table | 132 | .section __ex_table,"a" |
| 133 | .word 4b, __retl_efault | 133 | .word 4b, __retl_efault |
| 134 | .word 5b, __retl_efault | 134 | .word 5b, __retl_efault |
| 135 | .word 6b, __retl_efault | 135 | .word 6b, __retl_efault |
diff --git a/arch/sparc64/lib/U1copy_from_user.S b/arch/sparc64/lib/U1copy_from_user.S index 93146a81e2d3..3192b0bf4fab 100644 --- a/arch/sparc64/lib/U1copy_from_user.S +++ b/arch/sparc64/lib/U1copy_from_user.S | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | .align 4; \ | 9 | .align 4; \ |
| 10 | 99: retl; \ | 10 | 99: retl; \ |
| 11 | mov 1, %o0; \ | 11 | mov 1, %o0; \ |
| 12 | .section __ex_table; \ | 12 | .section __ex_table,"a";\ |
| 13 | .align 4; \ | 13 | .align 4; \ |
| 14 | .word 98b, 99b; \ | 14 | .word 98b, 99b; \ |
| 15 | .text; \ | 15 | .text; \ |
diff --git a/arch/sparc64/lib/U1copy_to_user.S b/arch/sparc64/lib/U1copy_to_user.S index 1fccc521e2bd..d1210ffb0b82 100644 --- a/arch/sparc64/lib/U1copy_to_user.S +++ b/arch/sparc64/lib/U1copy_to_user.S | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | .align 4; \ | 9 | .align 4; \ |
| 10 | 99: retl; \ | 10 | 99: retl; \ |
| 11 | mov 1, %o0; \ | 11 | mov 1, %o0; \ |
| 12 | .section __ex_table; \ | 12 | .section __ex_table,"a";\ |
| 13 | .align 4; \ | 13 | .align 4; \ |
| 14 | .word 98b, 99b; \ | 14 | .word 98b, 99b; \ |
| 15 | .text; \ | 15 | .text; \ |
diff --git a/arch/sparc64/lib/U3copy_from_user.S b/arch/sparc64/lib/U3copy_from_user.S index df600b667e48..f5bfc8d9d216 100644 --- a/arch/sparc64/lib/U3copy_from_user.S +++ b/arch/sparc64/lib/U3copy_from_user.S | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | .align 4; \ | 9 | .align 4; \ |
| 10 | 99: retl; \ | 10 | 99: retl; \ |
| 11 | mov 1, %o0; \ | 11 | mov 1, %o0; \ |
| 12 | .section __ex_table; \ | 12 | .section __ex_table,"a";\ |
| 13 | .align 4; \ | 13 | .align 4; \ |
| 14 | .word 98b, 99b; \ | 14 | .word 98b, 99b; \ |
| 15 | .text; \ | 15 | .text; \ |
diff --git a/arch/sparc64/lib/U3copy_to_user.S b/arch/sparc64/lib/U3copy_to_user.S index f337f22ed82e..2334f111bb0c 100644 --- a/arch/sparc64/lib/U3copy_to_user.S +++ b/arch/sparc64/lib/U3copy_to_user.S | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | .align 4; \ | 9 | .align 4; \ |
| 10 | 99: retl; \ | 10 | 99: retl; \ |
| 11 | mov 1, %o0; \ | 11 | mov 1, %o0; \ |
| 12 | .section __ex_table; \ | 12 | .section __ex_table,"a";\ |
| 13 | .align 4; \ | 13 | .align 4; \ |
| 14 | .word 98b, 99b; \ | 14 | .word 98b, 99b; \ |
| 15 | .text; \ | 15 | .text; \ |
diff --git a/arch/sparc64/lib/bzero.S b/arch/sparc64/lib/bzero.S index 21a933ffb7c2..1d2abcfa4e52 100644 --- a/arch/sparc64/lib/bzero.S +++ b/arch/sparc64/lib/bzero.S | |||
| @@ -92,7 +92,7 @@ __bzero_done: | |||
| 92 | .align 4; \ | 92 | .align 4; \ |
| 93 | 99: retl; \ | 93 | 99: retl; \ |
| 94 | mov %o1, %o0; \ | 94 | mov %o1, %o0; \ |
| 95 | .section __ex_table; \ | 95 | .section __ex_table,"a";\ |
| 96 | .align 4; \ | 96 | .align 4; \ |
| 97 | .word 98b, 99b; \ | 97 | .word 98b, 99b; \ |
| 98 | .text; \ | 98 | .text; \ |
diff --git a/arch/sparc64/lib/copy_in_user.S b/arch/sparc64/lib/copy_in_user.S index 816076c0bc06..650af3f21f78 100644 --- a/arch/sparc64/lib/copy_in_user.S +++ b/arch/sparc64/lib/copy_in_user.S | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | .align 4; \ | 13 | .align 4; \ |
| 14 | 99: retl; \ | 14 | 99: retl; \ |
| 15 | mov 1, %o0; \ | 15 | mov 1, %o0; \ |
| 16 | .section __ex_table; \ | 16 | .section __ex_table,"a";\ |
| 17 | .align 4; \ | 17 | .align 4; \ |
| 18 | .word 98b, 99b; \ | 18 | .word 98b, 99b; \ |
| 19 | .text; \ | 19 | .text; \ |
diff --git a/arch/sparc64/lib/csum_copy_from_user.S b/arch/sparc64/lib/csum_copy_from_user.S index 817ebdae39f8..a22eddbe5dba 100644 --- a/arch/sparc64/lib/csum_copy_from_user.S +++ b/arch/sparc64/lib/csum_copy_from_user.S | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | .align 4; \ | 9 | .align 4; \ |
| 10 | 99: retl; \ | 10 | 99: retl; \ |
| 11 | mov -1, %o0; \ | 11 | mov -1, %o0; \ |
| 12 | .section __ex_table; \ | 12 | .section __ex_table,"a";\ |
| 13 | .align 4; \ | 13 | .align 4; \ |
| 14 | .word 98b, 99b; \ | 14 | .word 98b, 99b; \ |
| 15 | .text; \ | 15 | .text; \ |
diff --git a/arch/sparc64/lib/csum_copy_to_user.S b/arch/sparc64/lib/csum_copy_to_user.S index c2f9463ea1e2..d5b12f441f02 100644 --- a/arch/sparc64/lib/csum_copy_to_user.S +++ b/arch/sparc64/lib/csum_copy_to_user.S | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | .align 4; \ | 9 | .align 4; \ |
| 10 | 99: retl; \ | 10 | 99: retl; \ |
| 11 | mov -1, %o0; \ | 11 | mov -1, %o0; \ |
| 12 | .section __ex_table; \ | 12 | .section __ex_table,"a";\ |
| 13 | .align 4; \ | 13 | .align 4; \ |
| 14 | .word 98b, 99b; \ | 14 | .word 98b, 99b; \ |
| 15 | .text; \ | 15 | .text; \ |
diff --git a/arch/sparc64/lib/strlen_user.S b/arch/sparc64/lib/strlen_user.S index 9ed54ba14fc6..114ed111e251 100644 --- a/arch/sparc64/lib/strlen_user.S +++ b/arch/sparc64/lib/strlen_user.S | |||
| @@ -85,7 +85,7 @@ __strnlen_user: | |||
| 85 | retl | 85 | retl |
| 86 | clr %o0 | 86 | clr %o0 |
| 87 | 87 | ||
| 88 | .section __ex_table,#alloc | 88 | .section __ex_table,"a" |
| 89 | .align 4 | 89 | .align 4 |
| 90 | 90 | ||
| 91 | .word 10b, 30b | 91 | .word 10b, 30b |
diff --git a/arch/sparc64/lib/strncpy_from_user.S b/arch/sparc64/lib/strncpy_from_user.S index e1264650ca7a..b2f499f79427 100644 --- a/arch/sparc64/lib/strncpy_from_user.S +++ b/arch/sparc64/lib/strncpy_from_user.S | |||
| @@ -125,7 +125,7 @@ __strncpy_from_user: | |||
| 125 | add %o2, %o3, %o0 | 125 | add %o2, %o3, %o0 |
| 126 | .size __strncpy_from_user, .-__strncpy_from_user | 126 | .size __strncpy_from_user, .-__strncpy_from_user |
| 127 | 127 | ||
| 128 | .section __ex_table,#alloc | 128 | .section __ex_table,"a" |
| 129 | .align 4 | 129 | .align 4 |
| 130 | .word 60b, __retl_efault | 130 | .word 60b, __retl_efault |
| 131 | .word 61b, __retl_efault | 131 | .word 61b, __retl_efault |
diff --git a/arch/sparc64/solaris/entry64.S b/arch/sparc64/solaris/entry64.S index eb314ed23cdb..f170324e8bf2 100644 --- a/arch/sparc64/solaris/entry64.S +++ b/arch/sparc64/solaris/entry64.S | |||
| @@ -217,7 +217,7 @@ solaris_unimplemented: | |||
| 217 | ba,pt %xcc, ret_from_solaris | 217 | ba,pt %xcc, ret_from_solaris |
| 218 | nop | 218 | nop |
| 219 | 219 | ||
| 220 | .section __ex_table,#alloc | 220 | .section __ex_table,"a" |
| 221 | .align 4 | 221 | .align 4 |
| 222 | .word exen, exenf | 222 | .word exen, exenf |
| 223 | 223 | ||
