Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit f5b940997397229975ea073679b03967932a541b

Authored by NeilBrown
Committed by Linus Torvalds
1 parent b727d20269
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

All Arch: remove linkage for sys_nfsservctl system call 

The nfsservctl system call is now gone, so we should remove all
linkage for it.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 33 changed files with 27 additions and 44 deletions Side-by-side Diff

arch/alpha/kernel/systbls.S
Diff comments   View file @ f5b9409
... ... @@ -360,7 +360,7 @@
360 360 .quad sys_newuname
361 361 .quad sys_nanosleep /* 340 */
362 362 .quad sys_mremap
363   - .quad sys_nfsservctl
  363 + .quad sys_ni_syscall /* old nfsservctl */
364 364 .quad sys_setresuid
365 365 .quad sys_getresuid
366 366 .quad sys_pciconfig_read /* 345 */
arch/arm/kernel/calls.S
Diff comments   View file @ f5b9409
... ... @@ -178,7 +178,7 @@
178 178 CALL(sys_ni_syscall) /* vm86 */
179 179 CALL(sys_ni_syscall) /* was sys_query_module */
180 180 CALL(sys_poll)
181   - CALL(sys_nfsservctl)
  181 + CALL(sys_ni_syscall) /* was nfsservctl */
182 182 /* 170 */ CALL(sys_setresgid16)
183 183 CALL(sys_getresgid16)
184 184 CALL(sys_prctl)
arch/avr32/kernel/syscall_table.S
Diff comments   View file @ f5b9409
... ... @@ -158,7 +158,7 @@
158 158 .long sys_sched_rr_get_interval
159 159 .long sys_nanosleep
160 160 .long sys_poll
161   - .long sys_nfsservctl /* 145 */
  161 + .long sys_ni_syscall /* 145 was nfsservctl */
162 162 .long sys_setresgid
163 163 .long sys_getresgid
164 164 .long sys_prctl
arch/blackfin/mach-common/entry.S
Diff comments   View file @ f5b9409
... ... @@ -1543,7 +1543,7 @@
1543 1543 .long _sys_ni_syscall /* for vm86 */
1544 1544 .long _sys_ni_syscall /* old "query_module" */
1545 1545 .long _sys_ni_syscall /* sys_poll */
1546   - .long _sys_nfsservctl
  1546 + .long _sys_ni_syscall /* old nfsservctl */
1547 1547 .long _sys_setresgid /* setresgid16 */ /* 170 */
1548 1548 .long _sys_getresgid /* getresgid16 */
1549 1549 .long _sys_prctl
arch/cris/arch-v10/kernel/entry.S
Diff comments   View file @ f5b9409
... ... @@ -771,7 +771,7 @@
771 771 .long sys_ni_syscall /* sys_vm86 */
772 772 .long sys_ni_syscall /* Old sys_query_module */
773 773 .long sys_poll
774   - .long sys_nfsservctl
  774 + .long sys_ni_syscall /* old nfsservctl */
775 775 .long sys_setresgid16 /* 170 */
776 776 .long sys_getresgid16
777 777 .long sys_prctl
arch/cris/arch-v32/kernel/entry.S
Diff comments   View file @ f5b9409
... ... @@ -714,7 +714,7 @@
714 714 .long sys_ni_syscall /* sys_vm86 */
715 715 .long sys_ni_syscall /* Old sys_query_module */
716 716 .long sys_poll
717   - .long sys_nfsservctl
  717 + .long sys_ni_syscall /* Old nfsservctl */
718 718 .long sys_setresgid16 /* 170 */
719 719 .long sys_getresgid16
720 720 .long sys_prctl
arch/frv/kernel/entry.S
Diff comments   View file @ f5b9409
... ... @@ -1358,7 +1358,7 @@
1358 1358 .long sys_ni_syscall /* for vm86 */
1359 1359 .long sys_ni_syscall /* Old sys_query_module */
1360 1360 .long sys_poll
1361   - .long sys_nfsservctl
  1361 + .long sys_ni_syscall /* Old nfsservctl */
1362 1362 .long sys_setresgid16 /* 170 */
1363 1363 .long sys_getresgid16
1364 1364 .long sys_prctl
arch/h8300/kernel/syscalls.S
Diff comments   View file @ f5b9409
... ... @@ -183,7 +183,7 @@
183 183 .long SYMBOL_NAME(sys_ni_syscall) /* for vm86 */
184 184 .long SYMBOL_NAME(sys_ni_syscall) /* sys_query_module */
185 185 .long SYMBOL_NAME(sys_poll)
186   - .long SYMBOL_NAME(sys_nfsservctl)
  186 + .long SYMBOL_NAME(sys_ni_syscall) /* old nfsservctl */
187 187 .long SYMBOL_NAME(sys_setresgid16) /* 170 */
188 188 .long SYMBOL_NAME(sys_getresgid16)
189 189 .long SYMBOL_NAME(sys_prctl)
arch/ia64/kernel/entry.S
Diff comments   View file @ f5b9409
... ... @@ -1614,7 +1614,7 @@
1614 1614 data8 sys_sched_get_priority_min
1615 1615 data8 sys_sched_rr_get_interval
1616 1616 data8 sys_nanosleep
1617   - data8 sys_nfsservctl
  1617 + data8 sys_ni_syscall // old nfsservctl
1618 1618 data8 sys_prctl // 1170
1619 1619 data8 sys_getpagesize
1620 1620 data8 sys_mmap2
arch/m32r/kernel/syscall_table.S
Diff comments   View file @ f5b9409
... ... @@ -168,7 +168,7 @@
168 168 .long sys_tas /* vm86 syscall holder */
169 169 .long sys_ni_syscall /* query_module syscall holder */
170 170 .long sys_poll
171   - .long sys_nfsservctl
  171 + .long sys_ni_syscall /* was nfsservctl */
172 172 .long sys_setresgid /* 170 */
173 173 .long sys_getresgid
174 174 .long sys_prctl
arch/m68k/kernel/syscalltable.S
Diff comments   View file @ f5b9409
... ... @@ -189,7 +189,7 @@
189 189 .long sys_getpagesize
190 190 .long sys_ni_syscall /* old "query_module" */
191 191 .long sys_poll
192   - .long sys_nfsservctl
  192 + .long sys_ni_syscall /* old nfsservctl */
193 193 .long sys_setresgid16 /* 170 */
194 194 .long sys_getresgid16
195 195 .long sys_prctl
arch/microblaze/kernel/syscall_table.S
Diff comments   View file @ f5b9409
... ... @@ -173,7 +173,7 @@
173 173 .long sys_ni_syscall /* sys_vm86 */
174 174 .long sys_ni_syscall /* Old sys_query_module */
175 175 .long sys_poll
176   - .long sys_nfsservctl
  176 + .long sys_ni_syscall /* old nfsservctl */
177 177 .long sys_setresgid /* 170 */
178 178 .long sys_getresgid
179 179 .long sys_prctl
arch/mips/kernel/scall32-o32.S
Diff comments   View file @ f5b9409
... ... @@ -424,7 +424,7 @@
424 424 sys sys_getresuid 3
425 425 sys sys_ni_syscall 0 /* was sys_query_module */
426 426 sys sys_poll 3
427   - sys sys_nfsservctl 3
  427 + sys sys_ni_syscall 0 /* was nfsservctl */
428 428 sys sys_setresgid 3 /* 4190 */
429 429 sys sys_getresgid 3
430 430 sys sys_prctl 5
arch/mips/kernel/scall64-64.S
Diff comments   View file @ f5b9409
... ... @@ -299,7 +299,7 @@
299 299 PTR sys_ni_syscall /* 5170, was get_kernel_syms */
300 300 PTR sys_ni_syscall /* was query_module */
301 301 PTR sys_quotactl
302   - PTR sys_nfsservctl
  302 + PTR sys_ni_syscall /* was nfsservctl */
303 303 PTR sys_ni_syscall /* res. for getpmsg */
304 304 PTR sys_ni_syscall /* 5175 for putpmsg */
305 305 PTR sys_ni_syscall /* res. for afs_syscall */
arch/mips/kernel/scall64-n32.S
Diff comments   View file @ f5b9409
... ... @@ -294,7 +294,7 @@
294 294 PTR sys_ni_syscall /* 6170, was get_kernel_syms */
295 295 PTR sys_ni_syscall /* was query_module */
296 296 PTR sys_quotactl
297   - PTR compat_sys_nfsservctl
  297 + PTR sys_ni_syscall /* was nfsservctl */
298 298 PTR sys_ni_syscall /* res. for getpmsg */
299 299 PTR sys_ni_syscall /* 6175 for putpmsg */
300 300 PTR sys_ni_syscall /* res. for afs_syscall */
arch/mips/kernel/scall64-o32.S
Diff comments   View file @ f5b9409
... ... @@ -392,7 +392,7 @@
392 392 PTR sys_getresuid
393 393 PTR sys_ni_syscall /* was query_module */
394 394 PTR sys_poll
395   - PTR compat_sys_nfsservctl
  395 + PTR sys_ni_syscall /* was nfsservctl */
396 396 PTR sys_setresgid /* 4190 */
397 397 PTR sys_getresgid
398 398 PTR sys_prctl
arch/mn10300/kernel/entry.S
Diff comments   View file @ f5b9409
... ... @@ -589,7 +589,7 @@
589 589 .long sys_ni_syscall /* vm86 */
590 590 .long sys_ni_syscall /* Old sys_query_module */
591 591 .long sys_poll
592   - .long sys_nfsservctl
  592 + .long sys_ni_syscall /* was nfsservctl */
593 593 .long sys_setresgid16 /* 170 */
594 594 .long sys_getresgid16
595 595 .long sys_prctl
arch/s390/kernel/compat_wrapper.S
Diff comments   View file @ f5b9409
... ... @@ -665,12 +665,6 @@
665 665 lgfr %r4,%r4 # long
666 666 jg sys_poll # branch to system call
667 667  
668   -ENTRY(compat_sys_nfsservctl_wrapper)
669   - lgfr %r2,%r2 # int
670   - llgtr %r3,%r3 # struct compat_nfsctl_arg*
671   - llgtr %r4,%r4 # union compat_nfsctl_res*
672   - jg compat_sys_nfsservctl # branch to system call
673   -
674 668 ENTRY(sys32_setresgid16_wrapper)
675 669 llgfr %r2,%r2 # __kernel_old_gid_emu31_t
676 670 llgfr %r3,%r3 # __kernel_old_gid_emu31_t
arch/s390/kernel/syscalls.S
Diff comments   View file @ f5b9409
... ... @@ -177,7 +177,7 @@
177 177 NI_SYSCALL /* for vm86 */
178 178 NI_SYSCALL /* old sys_query_module */
179 179 SYSCALL(sys_poll,sys_poll,sys32_poll_wrapper)
180   -SYSCALL(sys_nfsservctl,sys_nfsservctl,compat_sys_nfsservctl_wrapper)
  180 +NI_SYSCALL /* old nfsservctl */
181 181 SYSCALL(sys_setresgid16,sys_ni_syscall,sys32_setresgid16_wrapper) /* 170 old setresgid16 syscall */
182 182 SYSCALL(sys_getresgid16,sys_ni_syscall,sys32_getresgid16_wrapper) /* old getresgid16 syscall */
183 183 SYSCALL(sys_prctl,sys_prctl,sys32_prctl_wrapper)
arch/sh/kernel/syscalls_32.S
Diff comments   View file @ f5b9409
... ... @@ -185,7 +185,7 @@
185 185 .long sys_ni_syscall /* vm86 */
186 186 .long sys_ni_syscall /* old "query_module" */
187 187 .long sys_poll
188   - .long sys_nfsservctl
  188 + .long sys_ni_syscall /* was nfsservctl */
189 189 .long sys_setresgid16 /* 170 */
190 190 .long sys_getresgid16
191 191 .long sys_prctl
arch/sh/kernel/syscalls_64.S
Diff comments   View file @ f5b9409
... ... @@ -189,7 +189,7 @@
189 189 .long sys_ni_syscall /* vm86 */
190 190 .long sys_ni_syscall /* old "query_module" */
191 191 .long sys_poll
192   - .long sys_nfsservctl
  192 + .long sys_ni_syscall /* was nfsservctl */
193 193 .long sys_setresgid16 /* 170 */
194 194 .long sys_getresgid16
195 195 .long sys_prctl
arch/sparc/kernel/sys32.S
Diff comments   View file @ f5b9409
... ... @@ -81,7 +81,6 @@
81 81 SIGN2(sys32_fadvise64_64, compat_sys_fadvise64_64, %o0, %o5)
82 82 SIGN2(sys32_bdflush, sys_bdflush, %o0, %o1)
83 83 SIGN1(sys32_mlockall, sys_mlockall, %o0)
84   -SIGN1(sys32_nfsservctl, compat_sys_nfsservctl, %o0)
85 84 SIGN1(sys32_clock_nanosleep, compat_sys_clock_nanosleep, %o1)
86 85 SIGN1(sys32_timer_settime, compat_sys_timer_settime, %o1)
87 86 SIGN1(sys32_io_submit, compat_sys_io_submit, %o1)
arch/sparc/kernel/systbls_32.S
Diff comments   View file @ f5b9409
... ... @@ -67,7 +67,7 @@
67 67 /*235*/ .long sys_fstatfs64, sys_llseek, sys_mlock, sys_munlock, sys_mlockall
68 68 /*240*/ .long sys_munlockall, sys_sched_setparam, sys_sched_getparam, sys_sched_setscheduler, sys_sched_getscheduler
69 69 /*245*/ .long sys_sched_yield, sys_sched_get_priority_max, sys_sched_get_priority_min, sys_sched_rr_get_interval, sys_nanosleep
70   -/*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
  70 +/*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall
71 71 /*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
72 72 /*260*/ .long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
73 73 /*265*/ .long sys_timer_delete, sys_timer_create, sys_nis_syscall, sys_io_setup, sys_io_destroy
arch/sparc/kernel/systbls_64.S
Diff comments   View file @ f5b9409
... ... @@ -145,7 +145,7 @@
145 145 .word sys_fstatfs64, sys_llseek, sys_mlock, sys_munlock, sys_mlockall
146 146 /*240*/ .word sys_munlockall, sys_sched_setparam, sys_sched_getparam, sys_sched_setscheduler, sys_sched_getscheduler
147 147 .word sys_sched_yield, sys_sched_get_priority_max, sys_sched_get_priority_min, sys_sched_rr_get_interval, sys_nanosleep
148   -/*250*/ .word sys_64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
  148 +/*250*/ .word sys_64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nis_syscall
149 149 .word sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
150 150 /*260*/ .word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
151 151 .word sys_timer_delete, sys_timer_create, sys_ni_syscall, sys_io_setup, sys_io_destroy
arch/x86/ia32/ia32entry.S
Diff comments   View file @ f5b9409
... ... @@ -672,7 +672,7 @@
672 672 .quad sys32_vm86_warning /* vm86 */
673 673 .quad quiet_ni_syscall /* query_module */
674 674 .quad sys_poll
675   - .quad compat_sys_nfsservctl
  675 + .quad quiet_ni_syscall /* old nfsservctl */
676 676 .quad sys_setresgid16 /* 170 */
677 677 .quad sys_getresgid16
678 678 .quad sys_prctl
arch/x86/include/asm/unistd_64.h
Diff comments   View file @ f5b9409
... ... @@ -414,7 +414,7 @@
414 414 __SYSCALL(__NR_quotactl, sys_quotactl)
415 415  
416 416 #define __NR_nfsservctl 180
417   -__SYSCALL(__NR_nfsservctl, sys_nfsservctl)
  417 +__SYSCALL(__NR_nfsservctl, sys_ni_syscall)
418 418  
419 419 /* reserved for LiS/STREAMS */
420 420 #define __NR_getpmsg 181
arch/x86/kernel/syscall_table_32.S
Diff comments   View file @ f5b9409
... ... @@ -168,7 +168,7 @@
168 168 .long ptregs_vm86
169 169 .long sys_ni_syscall /* Old sys_query_module */
170 170 .long sys_poll
171   - .long sys_nfsservctl
  171 + .long sys_ni_syscall /* Old nfsservctl */
172 172 .long sys_setresgid16 /* 170 */
173 173 .long sys_getresgid16
174 174 .long sys_prctl
arch/xtensa/include/asm/unistd.h
Diff comments   View file @ f5b9409
... ... @@ -455,7 +455,7 @@
455 455 #define __NR_quotactl 204
456 456 __SYSCALL(204, sys_quotactl, 4)
457 457 #define __NR_nfsservctl 205
458   -__SYSCALL(205, sys_nfsservctl, 3)
  458 +__SYSCALL(205, sys_ni_syscall, 0)
459 459 #define __NR__sysctl 206
460 460 __SYSCALL(206, sys_sysctl, 1)
461 461 #define __NR_bdflush 207
... ... @@ -1675,11 +1675,6 @@
1675 1675 }
1676 1676 #endif /* HAVE_SET_RESTORE_SIGMASK */
1677 1677  
1678   -long asmlinkage compat_sys_nfsservctl(int cmd, void *notused, void *notused2)
1679   -{
1680   - return sys_ni_syscall();
1681   -}
1682   -
1683 1678 #ifdef CONFIG_EPOLL
1684 1679  
1685 1680 #ifdef HAVE_SET_RESTORE_SIGMASK
include/asm-generic/unistd.h
Diff comments   View file @ f5b9409
... ... @@ -143,7 +143,7 @@
143 143  
144 144 /* fs/nfsctl.c */
145 145 #define __NR_nfsservctl 42
146   -__SC_COMP(__NR_nfsservctl, sys_nfsservctl, compat_sys_nfsservctl)
  146 +__SYSCALL(__NR_nfsservctl, sys_ni_syscall)
147 147  
148 148 /* fs/open.c */
149 149 #define __NR3264_statfs 43
include/linux/compat.h
Diff comments   View file @ f5b9409
... ... @@ -438,7 +438,6 @@
438 438 struct compat_timespec __user *tsp,
439 439 const compat_sigset_t __user *sigmask,
440 440 compat_size_t sigsetsize);
441   -asmlinkage long compat_sys_nfsservctl(int cmd, void *notused, void *notused2);
442 441 asmlinkage long compat_sys_signalfd4(int ufd,
443 442 const compat_sigset_t __user *sigmask,
444 443 compat_size_t sigsetsize, int flags);
include/linux/syscalls.h
Diff comments   View file @ f5b9409
... ... @@ -702,9 +702,6 @@
702 702 asmlinkage long sys_sysinfo(struct sysinfo __user *info);
703 703 asmlinkage long sys_sysfs(int option,
704 704 unsigned long arg1, unsigned long arg2);
705   -asmlinkage long sys_nfsservctl(int cmd,
706   - struct nfsctl_arg __user *arg,
707   - void __user *res);
708 705 asmlinkage long sys_syslog(int type, char __user *buf, int len);
709 706 asmlinkage long sys_uselib(const char __user *library);
710 707 asmlinkage long sys_ni_syscall(void);
... ... @@ -16,7 +16,6 @@
16 16 return -ENOSYS;
17 17 }
18 18  
19   -cond_syscall(sys_nfsservctl);
20 19 cond_syscall(sys_quotactl);
21 20 cond_syscall(sys32_quotactl);
22 21 cond_syscall(sys_acct);