diff options
| -rw-r--r-- | arch/sparc/kernel/entry.S | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/systbls.S | 3 | ||||
| -rw-r--r-- | arch/sparc64/defconfig | 5 | ||||
| -rw-r--r-- | arch/sparc64/kernel/entry.S | 2 | ||||
| -rw-r--r-- | arch/sparc64/kernel/systbls.S | 5 | ||||
| -rw-r--r-- | arch/sparc64/solaris/systbl.S | 29 | ||||
| -rw-r--r-- | include/asm-sparc/unistd.h | 7 | ||||
| -rw-r--r-- | include/asm-sparc64/unistd.h | 7 |
8 files changed, 18 insertions, 42 deletions
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S index 267ec8f6fb58..887f6a160c58 100644 --- a/arch/sparc/kernel/entry.S +++ b/arch/sparc/kernel/entry.S | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | 38 | ||
| 39 | #define curptr g6 | 39 | #define curptr g6 |
| 40 | 40 | ||
| 41 | #define NR_SYSCALLS 299 /* Each OS is different... */ | 41 | #define NR_SYSCALLS 300 /* Each OS is different... */ |
| 42 | 42 | ||
| 43 | /* These are just handy. */ | 43 | /* These are just handy. */ |
| 44 | #define _SV save %sp, -STACKFRAME_SZ, %sp | 44 | #define _SV save %sp, -STACKFRAME_SZ, %sp |
diff --git a/arch/sparc/kernel/systbls.S b/arch/sparc/kernel/systbls.S index 6877ae4cd1d9..c0314705d73a 100644 --- a/arch/sparc/kernel/systbls.S +++ b/arch/sparc/kernel/systbls.S | |||
| @@ -78,7 +78,7 @@ sys_call_table: | |||
| 78 | /*280*/ .long sys_ni_syscall, sys_add_key, sys_request_key, sys_keyctl, sys_openat | 78 | /*280*/ .long sys_ni_syscall, sys_add_key, sys_request_key, sys_keyctl, sys_openat |
| 79 | /*285*/ .long sys_mkdirat, sys_mknodat, sys_fchownat, sys_futimesat, sys_newfstatat | 79 | /*285*/ .long sys_mkdirat, sys_mknodat, sys_fchownat, sys_futimesat, sys_newfstatat |
| 80 | /*290*/ .long sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat | 80 | /*290*/ .long sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat |
| 81 | /*295*/ .long sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll | 81 | /*295*/ .long sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare |
| 82 | 82 | ||
| 83 | #ifdef CONFIG_SUNOS_EMUL | 83 | #ifdef CONFIG_SUNOS_EMUL |
| 84 | /* Now the SunOS syscall table. */ | 84 | /* Now the SunOS syscall table. */ |
| @@ -190,5 +190,6 @@ sunos_sys_table: | |||
| 190 | /*290*/ .long sunos_nosys, sunos_nosys, sunos_nosys | 190 | /*290*/ .long sunos_nosys, sunos_nosys, sunos_nosys |
| 191 | .long sunos_nosys, sunos_nosys, sunos_nosys | 191 | .long sunos_nosys, sunos_nosys, sunos_nosys |
| 192 | .long sunos_nosys, sunos_nosys, sunos_nosys | 192 | .long sunos_nosys, sunos_nosys, sunos_nosys |
| 193 | .long sunos_nosys | ||
| 193 | 194 | ||
| 194 | #endif | 195 | #endif |
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index bc56a7d88308..069d49777b2a 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.16-rc2 | 3 | # Linux kernel version: 2.6.16-rc2 |
| 4 | # Sat Feb 4 02:31:38 2006 | 4 | # Tue Feb 7 17:47:18 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_SPARC=y | 6 | CONFIG_SPARC=y |
| 7 | CONFIG_SPARC64=y | 7 | CONFIG_SPARC64=y |
| @@ -30,7 +30,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 | |||
| 30 | # General setup | 30 | # General setup |
| 31 | # | 31 | # |
| 32 | CONFIG_LOCALVERSION="" | 32 | CONFIG_LOCALVERSION="" |
| 33 | CONFIG_LOCALVERSION_AUTO=y | 33 | # CONFIG_LOCALVERSION_AUTO is not set |
| 34 | CONFIG_SWAP=y | 34 | CONFIG_SWAP=y |
| 35 | CONFIG_SYSVIPC=y | 35 | CONFIG_SYSVIPC=y |
| 36 | CONFIG_POSIX_MQUEUE=y | 36 | CONFIG_POSIX_MQUEUE=y |
| @@ -766,6 +766,7 @@ CONFIG_HWMON=y | |||
| 766 | # CONFIG_SENSORS_ASB100 is not set | 766 | # CONFIG_SENSORS_ASB100 is not set |
| 767 | # CONFIG_SENSORS_ATXP1 is not set | 767 | # CONFIG_SENSORS_ATXP1 is not set |
| 768 | # CONFIG_SENSORS_DS1621 is not set | 768 | # CONFIG_SENSORS_DS1621 is not set |
| 769 | # CONFIG_SENSORS_F71805F is not set | ||
| 769 | # CONFIG_SENSORS_FSCHER is not set | 770 | # CONFIG_SENSORS_FSCHER is not set |
| 770 | # CONFIG_SENSORS_FSCPOS is not set | 771 | # CONFIG_SENSORS_FSCPOS is not set |
| 771 | # CONFIG_SENSORS_GL518SM is not set | 772 | # CONFIG_SENSORS_GL518SM is not set |
diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S index 12911e7463f2..a73553ae7e53 100644 --- a/arch/sparc64/kernel/entry.S +++ b/arch/sparc64/kernel/entry.S | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | #define curptr g6 | 26 | #define curptr g6 |
| 27 | 27 | ||
| 28 | #define NR_SYSCALLS 299 /* Each OS is different... */ | 28 | #define NR_SYSCALLS 300 /* Each OS is different... */ |
| 29 | 29 | ||
| 30 | .text | 30 | .text |
| 31 | .align 32 | 31 | .align 32 |
diff --git a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S index 2881faf36635..5928b3c33e27 100644 --- a/arch/sparc64/kernel/systbls.S +++ b/arch/sparc64/kernel/systbls.S | |||
| @@ -79,7 +79,7 @@ sys_call_table32: | |||
| 79 | /*280*/ .word sys_ni_syscall, sys_add_key, sys_request_key, sys_keyctl, compat_sys_openat | 79 | /*280*/ .word sys_ni_syscall, sys_add_key, sys_request_key, sys_keyctl, compat_sys_openat |
| 80 | .word sys_mkdirat, sys_mknodat, sys_fchownat, compat_sys_futimesat, compat_sys_newfstatat | 80 | .word sys_mkdirat, sys_mknodat, sys_fchownat, compat_sys_futimesat, compat_sys_newfstatat |
| 81 | /*285*/ .word sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat | 81 | /*285*/ .word sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat |
| 82 | .word sys_fchmodat, sys_faccessat, compat_sys_pselect6, compat_sys_ppoll | 82 | .word sys_fchmodat, sys_faccessat, compat_sys_pselect6, compat_sys_ppoll, sys_unshare |
| 83 | 83 | ||
| 84 | #endif /* CONFIG_COMPAT */ | 84 | #endif /* CONFIG_COMPAT */ |
| 85 | 85 | ||
| @@ -148,7 +148,7 @@ sys_call_table: | |||
| 148 | /*280*/ .word sys_nis_syscall, sys_add_key, sys_request_key, sys_keyctl, sys_openat | 148 | /*280*/ .word sys_nis_syscall, sys_add_key, sys_request_key, sys_keyctl, sys_openat |
| 149 | .word sys_mkdirat, sys_mknodat, sys_fchownat, sys_futimesat, compat_sys_newfstatat | 149 | .word sys_mkdirat, sys_mknodat, sys_fchownat, sys_futimesat, compat_sys_newfstatat |
| 150 | /*285*/ .word sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat | 150 | /*285*/ .word sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat |
| 151 | .word sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll | 151 | .word sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare |
| 152 | 152 | ||
| 153 | #if defined(CONFIG_SUNOS_EMUL) || defined(CONFIG_SOLARIS_EMUL) || \ | 153 | #if defined(CONFIG_SUNOS_EMUL) || defined(CONFIG_SOLARIS_EMUL) || \ |
| 154 | defined(CONFIG_SOLARIS_EMUL_MODULE) | 154 | defined(CONFIG_SOLARIS_EMUL_MODULE) |
| @@ -261,4 +261,5 @@ sunos_sys_table: | |||
| 261 | /*290*/ .word sunos_nosys, sunos_nosys, sunos_nosys | 261 | /*290*/ .word sunos_nosys, sunos_nosys, sunos_nosys |
| 262 | .word sunos_nosys, sunos_nosys, sunos_nosys | 262 | .word sunos_nosys, sunos_nosys, sunos_nosys |
| 263 | .word sunos_nosys, sunos_nosys, sunos_nosys | 263 | .word sunos_nosys, sunos_nosys, sunos_nosys |
| 264 | .word sunos_nosys | ||
| 264 | #endif | 265 | #endif |
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 | |||
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index 2ac64e65e336..0615d601a7c6 100644 --- a/include/asm-sparc/unistd.h +++ b/include/asm-sparc/unistd.h | |||
| @@ -315,11 +315,12 @@ | |||
| 315 | #define __NR_faccessat 296 | 315 | #define __NR_faccessat 296 |
| 316 | #define __NR_pselect6 297 | 316 | #define __NR_pselect6 297 |
| 317 | #define __NR_ppoll 298 | 317 | #define __NR_ppoll 298 |
| 318 | #define __NR_unshare 299 | ||
| 318 | 319 | ||
| 319 | /* WARNING: You MAY NOT add syscall numbers larger than 298, since | 320 | /* WARNING: You MAY NOT add syscall numbers larger than 299, since |
| 320 | * all of the syscall tables in the Sparc kernel are | 321 | * all of the syscall tables in the Sparc kernel are |
| 321 | * sized to have 298 entries (starting at zero). Therefore | 322 | * sized to have 299 entries (starting at zero). Therefore |
| 322 | * find a free slot in the 0-298 range. | 323 | * find a free slot in the 0-299 range. |
| 323 | */ | 324 | */ |
| 324 | 325 | ||
| 325 | #define _syscall0(type,name) \ | 326 | #define _syscall0(type,name) \ |
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h index 84ac2bdb0902..c58ba8a096cf 100644 --- a/include/asm-sparc64/unistd.h +++ b/include/asm-sparc64/unistd.h | |||
| @@ -317,11 +317,12 @@ | |||
| 317 | #define __NR_faccessat 296 | 317 | #define __NR_faccessat 296 |
| 318 | #define __NR_pselect6 297 | 318 | #define __NR_pselect6 297 |
| 319 | #define __NR_ppoll 298 | 319 | #define __NR_ppoll 298 |
| 320 | #define __NR_unshare 299 | ||
| 320 | 321 | ||
| 321 | /* WARNING: You MAY NOT add syscall numbers larger than 298, since | 322 | /* WARNING: You MAY NOT add syscall numbers larger than 299, since |
| 322 | * all of the syscall tables in the Sparc kernel are | 323 | * all of the syscall tables in the Sparc kernel are |
| 323 | * sized to have 298 entries (starting at zero). Therefore | 324 | * sized to have 299 entries (starting at zero). Therefore |
| 324 | * find a free slot in the 0-298 range. | 325 | * find a free slot in the 0-299 range. |
| 325 | */ | 326 | */ |
| 326 | 327 | ||
| 327 | #define _syscall0(type,name) \ | 328 | #define _syscall0(type,name) \ |
