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 /include | |
| 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 'include')
| -rw-r--r-- | include/asm-sparc64/futex.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc64/uaccess.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/asm-sparc64/futex.h b/include/asm-sparc64/futex.h index 0caf60147e97..34c4b43d3f98 100644 --- a/include/asm-sparc64/futex.h +++ b/include/asm-sparc64/futex.h | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | "4: ba 3b\n" \ | 20 | "4: ba 3b\n" \ |
| 21 | " mov %5, %0\n" \ | 21 | " mov %5, %0\n" \ |
| 22 | " .previous\n" \ | 22 | " .previous\n" \ |
| 23 | " .section __ex_table,#alloc\n" \ | 23 | " .section __ex_table,\"a\"\n" \ |
| 24 | " .align 4\n" \ | 24 | " .align 4\n" \ |
| 25 | " .word 1b, 4b\n" \ | 25 | " .word 1b, 4b\n" \ |
| 26 | " .word 2b, 4b\n" \ | 26 | " .word 2b, 4b\n" \ |
diff --git a/include/asm-sparc64/uaccess.h b/include/asm-sparc64/uaccess.h index 203e8eee6351..c91d1e38eac6 100644 --- a/include/asm-sparc64/uaccess.h +++ b/include/asm-sparc64/uaccess.h | |||
| @@ -136,7 +136,7 @@ __asm__ __volatile__( \ | |||
| 136 | "b 2b\n\t" \ | 136 | "b 2b\n\t" \ |
| 137 | " mov %3, %0\n\n\t" \ | 137 | " mov %3, %0\n\n\t" \ |
| 138 | ".previous\n\t" \ | 138 | ".previous\n\t" \ |
| 139 | ".section __ex_table,#alloc\n\t" \ | 139 | ".section __ex_table,\"a\"\n\t" \ |
| 140 | ".align 4\n\t" \ | 140 | ".align 4\n\t" \ |
| 141 | ".word 1b, 3b\n\t" \ | 141 | ".word 1b, 3b\n\t" \ |
| 142 | ".previous\n\n\t" \ | 142 | ".previous\n\n\t" \ |
| @@ -148,7 +148,7 @@ if (__builtin_constant_p(ret) && ret == -EFAULT) \ | |||
| 148 | __asm__ __volatile__( \ | 148 | __asm__ __volatile__( \ |
| 149 | "/* Put user asm ret, inline. */\n" \ | 149 | "/* Put user asm ret, inline. */\n" \ |
| 150 | "1:\t" "st"#size "a %1, [%2] %%asi\n\n\t" \ | 150 | "1:\t" "st"#size "a %1, [%2] %%asi\n\n\t" \ |
| 151 | ".section __ex_table,#alloc\n\t" \ | 151 | ".section __ex_table,\"a\"\n\t" \ |
| 152 | ".align 4\n\t" \ | 152 | ".align 4\n\t" \ |
| 153 | ".word 1b, __ret_efault\n\n\t" \ | 153 | ".word 1b, __ret_efault\n\n\t" \ |
| 154 | ".previous\n\n\t" \ | 154 | ".previous\n\n\t" \ |
| @@ -163,7 +163,7 @@ __asm__ __volatile__( \ | |||
| 163 | "ret\n\t" \ | 163 | "ret\n\t" \ |
| 164 | " restore %%g0, %3, %%o0\n\n\t" \ | 164 | " restore %%g0, %3, %%o0\n\n\t" \ |
| 165 | ".previous\n\t" \ | 165 | ".previous\n\t" \ |
| 166 | ".section __ex_table,#alloc\n\t" \ | 166 | ".section __ex_table,\"a\"\n\t" \ |
| 167 | ".align 4\n\t" \ | 167 | ".align 4\n\t" \ |
| 168 | ".word 1b, 3b\n\n\t" \ | 168 | ".word 1b, 3b\n\n\t" \ |
| 169 | ".previous\n\n\t" \ | 169 | ".previous\n\n\t" \ |
| @@ -206,7 +206,7 @@ __asm__ __volatile__( \ | |||
| 206 | "b 2b\n\t" \ | 206 | "b 2b\n\t" \ |
| 207 | " mov %3, %0\n\n\t" \ | 207 | " mov %3, %0\n\n\t" \ |
| 208 | ".previous\n\t" \ | 208 | ".previous\n\t" \ |
| 209 | ".section __ex_table,#alloc\n\t" \ | 209 | ".section __ex_table,\"a\"\n\t" \ |
| 210 | ".align 4\n\t" \ | 210 | ".align 4\n\t" \ |
| 211 | ".word 1b, 3b\n\n\t" \ | 211 | ".word 1b, 3b\n\n\t" \ |
| 212 | ".previous\n\t" \ | 212 | ".previous\n\t" \ |
| @@ -218,7 +218,7 @@ if (__builtin_constant_p(retval) && retval == -EFAULT) \ | |||
| 218 | __asm__ __volatile__( \ | 218 | __asm__ __volatile__( \ |
| 219 | "/* Get user asm ret, inline. */\n" \ | 219 | "/* Get user asm ret, inline. */\n" \ |
| 220 | "1:\t" "ld"#size "a [%1] %%asi, %0\n\n\t" \ | 220 | "1:\t" "ld"#size "a [%1] %%asi, %0\n\n\t" \ |
| 221 | ".section __ex_table,#alloc\n\t" \ | 221 | ".section __ex_table,\"a\"\n\t" \ |
| 222 | ".align 4\n\t" \ | 222 | ".align 4\n\t" \ |
| 223 | ".word 1b,__ret_efault\n\n\t" \ | 223 | ".word 1b,__ret_efault\n\n\t" \ |
| 224 | ".previous\n\t" \ | 224 | ".previous\n\t" \ |
| @@ -233,7 +233,7 @@ __asm__ __volatile__( \ | |||
| 233 | "ret\n\t" \ | 233 | "ret\n\t" \ |
| 234 | " restore %%g0, %2, %%o0\n\n\t" \ | 234 | " restore %%g0, %2, %%o0\n\n\t" \ |
| 235 | ".previous\n\t" \ | 235 | ".previous\n\t" \ |
| 236 | ".section __ex_table,#alloc\n\t" \ | 236 | ".section __ex_table,\"a\"\n\t" \ |
| 237 | ".align 4\n\t" \ | 237 | ".align 4\n\t" \ |
| 238 | ".word 1b, 3b\n\n\t" \ | 238 | ".word 1b, 3b\n\n\t" \ |
| 239 | ".previous\n\t" \ | 239 | ".previous\n\t" \ |