diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-03-14 18:05:45 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-03-14 18:05:45 -0500 |
| commit | c5111f504d2a9b0d258d7c4752b4093523315989 (patch) | |
| tree | 6a52864aff79691689aea21cb0cb928327d5de5b /arch/sparc64/solaris | |
| parent | 69eb66d7da7dba2696281981347698e1693c2340 (diff) | |
| parent | a488edc914aa1d766a4e2c982b5ae03d5657ec1b (diff) | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'arch/sparc64/solaris')
| -rw-r--r-- | arch/sparc64/solaris/entry64.S | 2 | ||||
| -rw-r--r-- | arch/sparc64/solaris/systbl.S | 29 |
2 files changed, 1 insertions, 30 deletions
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 | ||
diff --git a/arch/sparc64/solaris/systbl.S b/arch/sparc64/solaris/systbl.S index d25667eeae10..7043ca18caf9 100644 --- a/arch/sparc64/solaris/systbl.S +++ b/arch/sparc64/solaris/systbl.S | |||
| @@ -283,32 +283,3 @@ solaris_sys_table: | |||
| 283 | .word solaris_unimplemented /* 253 */ | 283 | .word solaris_unimplemented /* 253 */ |
| 284 | .word solaris_unimplemented /* 254 */ | 284 | .word solaris_unimplemented /* 254 */ |
| 285 | .word solaris_unimplemented /* 255 */ | 285 | .word solaris_unimplemented /* 255 */ |
| 286 | .word solaris_unimplemented /* 256 */ | ||
| 287 | .word solaris_unimplemented /* 257 */ | ||
| 288 | .word solaris_unimplemented /* 258 */ | ||
| 289 | .word solaris_unimplemented /* 259 */ | ||
| 290 | .word solaris_unimplemented /* 260 */ | ||
| 291 | .word solaris_unimplemented /* 261 */ | ||
| 292 | .word solaris_unimplemented /* 262 */ | ||
| 293 | .word solaris_unimplemented /* 263 */ | ||
| 294 | .word solaris_unimplemented /* 264 */ | ||
| 295 | .word solaris_unimplemented /* 265 */ | ||
| 296 | .word solaris_unimplemented /* 266 */ | ||
| 297 | .word solaris_unimplemented /* 267 */ | ||
| 298 | .word solaris_unimplemented /* 268 */ | ||
| 299 | .word solaris_unimplemented /* 269 */ | ||
| 300 | .word solaris_unimplemented /* 270 */ | ||
| 301 | .word solaris_unimplemented /* 271 */ | ||
| 302 | .word solaris_unimplemented /* 272 */ | ||
| 303 | .word solaris_unimplemented /* 273 */ | ||
| 304 | .word solaris_unimplemented /* 274 */ | ||
| 305 | .word solaris_unimplemented /* 275 */ | ||
| 306 | .word solaris_unimplemented /* 276 */ | ||
| 307 | .word solaris_unimplemented /* 277 */ | ||
| 308 | .word solaris_unimplemented /* 278 */ | ||
| 309 | .word solaris_unimplemented /* 279 */ | ||
| 310 | .word solaris_unimplemented /* 280 */ | ||
| 311 | .word solaris_unimplemented /* 281 */ | ||
| 312 | .word solaris_unimplemented /* 282 */ | ||
| 313 | .word solaris_unimplemented /* 283 */ | ||
| 314 | |||