diff options
-rw-r--r-- | arch/blackfin/include/asm/unistd.h | 1 | ||||
-rw-r--r-- | arch/cris/include/asm/unistd.h | 1 | ||||
-rw-r--r-- | arch/frv/include/asm/unistd.h | 1 | ||||
-rw-r--r-- | arch/m68k/include/asm/unistd.h | 1 | ||||
-rw-r--r-- | arch/microblaze/include/asm/unistd.h | 1 | ||||
-rw-r--r-- | arch/mips/include/asm/unistd.h | 1 | ||||
-rw-r--r-- | arch/mn10300/include/asm/unistd.h | 1 | ||||
-rw-r--r-- | arch/parisc/include/asm/unistd.h | 1 | ||||
-rw-r--r-- | arch/powerpc/include/asm/unistd.h | 1 | ||||
-rw-r--r-- | arch/sh/include/asm/unistd.h | 1 | ||||
-rw-r--r-- | arch/sparc/include/asm/unistd.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/unistd.h | 1 | ||||
-rw-r--r-- | init/Kconfig | 10 | ||||
-rw-r--r-- | kernel/signal.c | 4 | ||||
-rw-r--r-- | kernel/sys_ni.c | 2 |
15 files changed, 14 insertions, 14 deletions
diff --git a/arch/blackfin/include/asm/unistd.h b/arch/blackfin/include/asm/unistd.h index c35414bdf7bd..c8c8ff9eff61 100644 --- a/arch/blackfin/include/asm/unistd.h +++ b/arch/blackfin/include/asm/unistd.h | |||
@@ -12,7 +12,6 @@ | |||
12 | #define __ARCH_WANT_SYS_ALARM | 12 | #define __ARCH_WANT_SYS_ALARM |
13 | #define __ARCH_WANT_SYS_GETHOSTNAME | 13 | #define __ARCH_WANT_SYS_GETHOSTNAME |
14 | #define __ARCH_WANT_SYS_PAUSE | 14 | #define __ARCH_WANT_SYS_PAUSE |
15 | #define __ARCH_WANT_SYS_SGETMASK | ||
16 | #define __ARCH_WANT_SYS_TIME | 15 | #define __ARCH_WANT_SYS_TIME |
17 | #define __ARCH_WANT_SYS_FADVISE64 | 16 | #define __ARCH_WANT_SYS_FADVISE64 |
18 | #define __ARCH_WANT_SYS_GETPGRP | 17 | #define __ARCH_WANT_SYS_GETPGRP |
diff --git a/arch/cris/include/asm/unistd.h b/arch/cris/include/asm/unistd.h index 5cc7d1991e48..0f40fed1ba25 100644 --- a/arch/cris/include/asm/unistd.h +++ b/arch/cris/include/asm/unistd.h | |||
@@ -15,7 +15,6 @@ | |||
15 | #define __ARCH_WANT_SYS_GETHOSTNAME | 15 | #define __ARCH_WANT_SYS_GETHOSTNAME |
16 | #define __ARCH_WANT_SYS_IPC | 16 | #define __ARCH_WANT_SYS_IPC |
17 | #define __ARCH_WANT_SYS_PAUSE | 17 | #define __ARCH_WANT_SYS_PAUSE |
18 | #define __ARCH_WANT_SYS_SGETMASK | ||
19 | #define __ARCH_WANT_SYS_SIGNAL | 18 | #define __ARCH_WANT_SYS_SIGNAL |
20 | #define __ARCH_WANT_SYS_TIME | 19 | #define __ARCH_WANT_SYS_TIME |
21 | #define __ARCH_WANT_SYS_UTIME | 20 | #define __ARCH_WANT_SYS_UTIME |
diff --git a/arch/frv/include/asm/unistd.h b/arch/frv/include/asm/unistd.h index 70ec7293dce7..17b5df8fc28a 100644 --- a/arch/frv/include/asm/unistd.h +++ b/arch/frv/include/asm/unistd.h | |||
@@ -13,7 +13,6 @@ | |||
13 | /* #define __ARCH_WANT_SYS_GETHOSTNAME */ | 13 | /* #define __ARCH_WANT_SYS_GETHOSTNAME */ |
14 | #define __ARCH_WANT_SYS_IPC | 14 | #define __ARCH_WANT_SYS_IPC |
15 | #define __ARCH_WANT_SYS_PAUSE | 15 | #define __ARCH_WANT_SYS_PAUSE |
16 | /* #define __ARCH_WANT_SYS_SGETMASK */ | ||
17 | /* #define __ARCH_WANT_SYS_SIGNAL */ | 16 | /* #define __ARCH_WANT_SYS_SIGNAL */ |
18 | #define __ARCH_WANT_SYS_TIME | 17 | #define __ARCH_WANT_SYS_TIME |
19 | #define __ARCH_WANT_SYS_UTIME | 18 | #define __ARCH_WANT_SYS_UTIME |
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h index 33afa56ad47a..1fcdd344c7ad 100644 --- a/arch/m68k/include/asm/unistd.h +++ b/arch/m68k/include/asm/unistd.h | |||
@@ -13,7 +13,6 @@ | |||
13 | #define __ARCH_WANT_SYS_GETHOSTNAME | 13 | #define __ARCH_WANT_SYS_GETHOSTNAME |
14 | #define __ARCH_WANT_SYS_IPC | 14 | #define __ARCH_WANT_SYS_IPC |
15 | #define __ARCH_WANT_SYS_PAUSE | 15 | #define __ARCH_WANT_SYS_PAUSE |
16 | #define __ARCH_WANT_SYS_SGETMASK | ||
17 | #define __ARCH_WANT_SYS_SIGNAL | 16 | #define __ARCH_WANT_SYS_SIGNAL |
18 | #define __ARCH_WANT_SYS_TIME | 17 | #define __ARCH_WANT_SYS_TIME |
19 | #define __ARCH_WANT_SYS_UTIME | 18 | #define __ARCH_WANT_SYS_UTIME |
diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h index b14232b6878f..fd56a8f66489 100644 --- a/arch/microblaze/include/asm/unistd.h +++ b/arch/microblaze/include/asm/unistd.h | |||
@@ -19,7 +19,6 @@ | |||
19 | #define __ARCH_WANT_SYS_ALARM | 19 | #define __ARCH_WANT_SYS_ALARM |
20 | #define __ARCH_WANT_SYS_GETHOSTNAME | 20 | #define __ARCH_WANT_SYS_GETHOSTNAME |
21 | #define __ARCH_WANT_SYS_PAUSE | 21 | #define __ARCH_WANT_SYS_PAUSE |
22 | #define __ARCH_WANT_SYS_SGETMASK | ||
23 | #define __ARCH_WANT_SYS_SIGNAL | 22 | #define __ARCH_WANT_SYS_SIGNAL |
24 | #define __ARCH_WANT_SYS_TIME | 23 | #define __ARCH_WANT_SYS_TIME |
25 | #define __ARCH_WANT_SYS_UTIME | 24 | #define __ARCH_WANT_SYS_UTIME |
diff --git a/arch/mips/include/asm/unistd.h b/arch/mips/include/asm/unistd.h index 413d6c612bec..e55813029d5a 100644 --- a/arch/mips/include/asm/unistd.h +++ b/arch/mips/include/asm/unistd.h | |||
@@ -29,7 +29,6 @@ | |||
29 | #define __ARCH_WANT_SYS_GETHOSTNAME | 29 | #define __ARCH_WANT_SYS_GETHOSTNAME |
30 | #define __ARCH_WANT_SYS_IPC | 30 | #define __ARCH_WANT_SYS_IPC |
31 | #define __ARCH_WANT_SYS_PAUSE | 31 | #define __ARCH_WANT_SYS_PAUSE |
32 | #define __ARCH_WANT_SYS_SGETMASK | ||
33 | #define __ARCH_WANT_SYS_UTIME | 32 | #define __ARCH_WANT_SYS_UTIME |
34 | #define __ARCH_WANT_SYS_WAITPID | 33 | #define __ARCH_WANT_SYS_WAITPID |
35 | #define __ARCH_WANT_SYS_SOCKETCALL | 34 | #define __ARCH_WANT_SYS_SOCKETCALL |
diff --git a/arch/mn10300/include/asm/unistd.h b/arch/mn10300/include/asm/unistd.h index 9d4e2d1ef90e..0522468f488b 100644 --- a/arch/mn10300/include/asm/unistd.h +++ b/arch/mn10300/include/asm/unistd.h | |||
@@ -26,7 +26,6 @@ | |||
26 | #define __ARCH_WANT_SYS_GETHOSTNAME | 26 | #define __ARCH_WANT_SYS_GETHOSTNAME |
27 | #define __ARCH_WANT_SYS_IPC | 27 | #define __ARCH_WANT_SYS_IPC |
28 | #define __ARCH_WANT_SYS_PAUSE | 28 | #define __ARCH_WANT_SYS_PAUSE |
29 | #define __ARCH_WANT_SYS_SGETMASK | ||
30 | #define __ARCH_WANT_SYS_SIGNAL | 29 | #define __ARCH_WANT_SYS_SIGNAL |
31 | #define __ARCH_WANT_SYS_TIME | 30 | #define __ARCH_WANT_SYS_TIME |
32 | #define __ARCH_WANT_SYS_UTIME | 31 | #define __ARCH_WANT_SYS_UTIME |
diff --git a/arch/parisc/include/asm/unistd.h b/arch/parisc/include/asm/unistd.h index 74d835820ee7..5f4c68daa261 100644 --- a/arch/parisc/include/asm/unistd.h +++ b/arch/parisc/include/asm/unistd.h | |||
@@ -145,7 +145,6 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \ | |||
145 | #define __ARCH_WANT_SYS_ALARM | 145 | #define __ARCH_WANT_SYS_ALARM |
146 | #define __ARCH_WANT_SYS_GETHOSTNAME | 146 | #define __ARCH_WANT_SYS_GETHOSTNAME |
147 | #define __ARCH_WANT_SYS_PAUSE | 147 | #define __ARCH_WANT_SYS_PAUSE |
148 | #define __ARCH_WANT_SYS_SGETMASK | ||
149 | #define __ARCH_WANT_SYS_SIGNAL | 148 | #define __ARCH_WANT_SYS_SIGNAL |
150 | #define __ARCH_WANT_SYS_TIME | 149 | #define __ARCH_WANT_SYS_TIME |
151 | #define __ARCH_WANT_COMPAT_SYS_TIME | 150 | #define __ARCH_WANT_COMPAT_SYS_TIME |
diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h index 9b892bbd9d84..5ce5552ab9f5 100644 --- a/arch/powerpc/include/asm/unistd.h +++ b/arch/powerpc/include/asm/unistd.h | |||
@@ -29,7 +29,6 @@ | |||
29 | #define __ARCH_WANT_SYS_GETHOSTNAME | 29 | #define __ARCH_WANT_SYS_GETHOSTNAME |
30 | #define __ARCH_WANT_SYS_IPC | 30 | #define __ARCH_WANT_SYS_IPC |
31 | #define __ARCH_WANT_SYS_PAUSE | 31 | #define __ARCH_WANT_SYS_PAUSE |
32 | #define __ARCH_WANT_SYS_SGETMASK | ||
33 | #define __ARCH_WANT_SYS_SIGNAL | 32 | #define __ARCH_WANT_SYS_SIGNAL |
34 | #define __ARCH_WANT_SYS_TIME | 33 | #define __ARCH_WANT_SYS_TIME |
35 | #define __ARCH_WANT_SYS_UTIME | 34 | #define __ARCH_WANT_SYS_UTIME |
diff --git a/arch/sh/include/asm/unistd.h b/arch/sh/include/asm/unistd.h index e77816c4b9bc..126fe8340b22 100644 --- a/arch/sh/include/asm/unistd.h +++ b/arch/sh/include/asm/unistd.h | |||
@@ -11,7 +11,6 @@ | |||
11 | # define __ARCH_WANT_SYS_GETHOSTNAME | 11 | # define __ARCH_WANT_SYS_GETHOSTNAME |
12 | # define __ARCH_WANT_SYS_IPC | 12 | # define __ARCH_WANT_SYS_IPC |
13 | # define __ARCH_WANT_SYS_PAUSE | 13 | # define __ARCH_WANT_SYS_PAUSE |
14 | # define __ARCH_WANT_SYS_SGETMASK | ||
15 | # define __ARCH_WANT_SYS_SIGNAL | 14 | # define __ARCH_WANT_SYS_SIGNAL |
16 | # define __ARCH_WANT_SYS_TIME | 15 | # define __ARCH_WANT_SYS_TIME |
17 | # define __ARCH_WANT_SYS_UTIME | 16 | # define __ARCH_WANT_SYS_UTIME |
diff --git a/arch/sparc/include/asm/unistd.h b/arch/sparc/include/asm/unistd.h index dfa53fdd5cbc..0aac1e8f2968 100644 --- a/arch/sparc/include/asm/unistd.h +++ b/arch/sparc/include/asm/unistd.h | |||
@@ -25,7 +25,6 @@ | |||
25 | #define __ARCH_WANT_SYS_ALARM | 25 | #define __ARCH_WANT_SYS_ALARM |
26 | #define __ARCH_WANT_SYS_GETHOSTNAME | 26 | #define __ARCH_WANT_SYS_GETHOSTNAME |
27 | #define __ARCH_WANT_SYS_PAUSE | 27 | #define __ARCH_WANT_SYS_PAUSE |
28 | #define __ARCH_WANT_SYS_SGETMASK | ||
29 | #define __ARCH_WANT_SYS_SIGNAL | 28 | #define __ARCH_WANT_SYS_SIGNAL |
30 | #define __ARCH_WANT_SYS_TIME | 29 | #define __ARCH_WANT_SYS_TIME |
31 | #define __ARCH_WANT_SYS_UTIME | 30 | #define __ARCH_WANT_SYS_UTIME |
diff --git a/arch/x86/include/asm/unistd.h b/arch/x86/include/asm/unistd.h index 3f556c6a0157..2b19caa4081c 100644 --- a/arch/x86/include/asm/unistd.h +++ b/arch/x86/include/asm/unistd.h | |||
@@ -41,7 +41,6 @@ | |||
41 | # define __ARCH_WANT_SYS_OLD_GETRLIMIT | 41 | # define __ARCH_WANT_SYS_OLD_GETRLIMIT |
42 | # define __ARCH_WANT_SYS_OLD_UNAME | 42 | # define __ARCH_WANT_SYS_OLD_UNAME |
43 | # define __ARCH_WANT_SYS_PAUSE | 43 | # define __ARCH_WANT_SYS_PAUSE |
44 | # define __ARCH_WANT_SYS_SGETMASK | ||
45 | # define __ARCH_WANT_SYS_SIGNAL | 44 | # define __ARCH_WANT_SYS_SIGNAL |
46 | # define __ARCH_WANT_SYS_SIGPENDING | 45 | # define __ARCH_WANT_SYS_SIGPENDING |
47 | # define __ARCH_WANT_SYS_SIGPROCMASK | 46 | # define __ARCH_WANT_SYS_SIGPROCMASK |
diff --git a/init/Kconfig b/init/Kconfig index ce034ad4a162..9d76b99af1b9 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -1313,6 +1313,16 @@ config UID16 | |||
1313 | help | 1313 | help |
1314 | This enables the legacy 16-bit UID syscall wrappers. | 1314 | This enables the legacy 16-bit UID syscall wrappers. |
1315 | 1315 | ||
1316 | config SGETMASK_SYSCALL | ||
1317 | bool "sgetmask/ssetmask syscalls support" if EXPERT | ||
1318 | def_bool PARISC || MN10300 || BLACKFIN || M68K || PPC || MIPS || X86 || SPARC || CRIS || MICROBLAZE || SUPERH | ||
1319 | ---help--- | ||
1320 | sys_sgetmask and sys_ssetmask are obsolete system calls | ||
1321 | no longer supported in libc but still enabled by default in some | ||
1322 | architectures. | ||
1323 | |||
1324 | If unsure, leave the default option here. | ||
1325 | |||
1316 | config SYSFS_SYSCALL | 1326 | config SYSFS_SYSCALL |
1317 | bool "Sysfs syscall support" if EXPERT | 1327 | bool "Sysfs syscall support" if EXPERT |
1318 | default y | 1328 | default y |
diff --git a/kernel/signal.c b/kernel/signal.c index 6ea13c09ae56..6e600aaa2af4 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -3496,7 +3496,7 @@ COMPAT_SYSCALL_DEFINE3(sigaction, int, sig, | |||
3496 | } | 3496 | } |
3497 | #endif | 3497 | #endif |
3498 | 3498 | ||
3499 | #ifdef __ARCH_WANT_SYS_SGETMASK | 3499 | #ifdef CONFIG_SGETMASK_SYSCALL |
3500 | 3500 | ||
3501 | /* | 3501 | /* |
3502 | * For backwards compatibility. Functionality superseded by sigprocmask. | 3502 | * For backwards compatibility. Functionality superseded by sigprocmask. |
@@ -3517,7 +3517,7 @@ SYSCALL_DEFINE1(ssetmask, int, newmask) | |||
3517 | 3517 | ||
3518 | return old; | 3518 | return old; |
3519 | } | 3519 | } |
3520 | #endif /* __ARCH_WANT_SGETMASK */ | 3520 | #endif /* CONFIG_SGETMASK_SYSCALL */ |
3521 | 3521 | ||
3522 | #ifdef __ARCH_WANT_SYS_SIGNAL | 3522 | #ifdef __ARCH_WANT_SYS_SIGNAL |
3523 | /* | 3523 | /* |
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c index bc8d1b74a6b9..36441b51b5df 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c | |||
@@ -135,6 +135,8 @@ cond_syscall(sys_setresgid16); | |||
135 | cond_syscall(sys_setresuid16); | 135 | cond_syscall(sys_setresuid16); |
136 | cond_syscall(sys_setreuid16); | 136 | cond_syscall(sys_setreuid16); |
137 | cond_syscall(sys_setuid16); | 137 | cond_syscall(sys_setuid16); |
138 | cond_syscall(sys_sgetmask); | ||
139 | cond_syscall(sys_ssetmask); | ||
138 | cond_syscall(sys_vm86old); | 140 | cond_syscall(sys_vm86old); |
139 | cond_syscall(sys_vm86); | 141 | cond_syscall(sys_vm86); |
140 | cond_syscall(sys_ipc); | 142 | cond_syscall(sys_ipc); |