Commit 571503e10045c89af951962ea0bb783482663aad
Exists in
master
and in
4 other branches
Merge branch 'setns'
* setns: ns: Wire up the setns system call Done as a merge to make it easier to fix up conflicts in arm due to addition of sendmmsg system call
Showing 50 changed files Side-by-side Diff
- arch/alpha/include/asm/unistd.h
- arch/alpha/kernel/systbls.S
- arch/arm/include/asm/unistd.h
- arch/arm/kernel/calls.S
- arch/avr32/include/asm/unistd.h
- arch/avr32/kernel/syscall_table.S
- arch/blackfin/include/asm/unistd.h
- arch/blackfin/mach-common/entry.S
- arch/cris/arch-v10/kernel/entry.S
- arch/cris/arch-v32/kernel/entry.S
- arch/cris/include/asm/unistd.h
- arch/frv/include/asm/unistd.h
- arch/frv/kernel/entry.S
- arch/h8300/include/asm/unistd.h
- arch/h8300/kernel/syscalls.S
- arch/ia64/include/asm/unistd.h
- arch/ia64/kernel/entry.S
- arch/m32r/include/asm/unistd.h
- arch/m32r/kernel/syscall_table.S
- arch/m68k/include/asm/unistd.h
- arch/m68k/kernel/syscalltable.S
- arch/microblaze/include/asm/unistd.h
- arch/microblaze/kernel/syscall_table.S
- arch/mips/include/asm/unistd.h
- arch/mips/kernel/scall32-o32.S
- arch/mips/kernel/scall64-64.S
- arch/mips/kernel/scall64-n32.S
- arch/mips/kernel/scall64-o32.S
- arch/mn10300/include/asm/unistd.h
- arch/mn10300/kernel/entry.S
- arch/parisc/include/asm/unistd.h
- arch/parisc/kernel/syscall_table.S
- arch/powerpc/include/asm/systbl.h
- arch/powerpc/include/asm/unistd.h
- arch/s390/include/asm/unistd.h
- arch/s390/kernel/compat_wrapper.S
- arch/s390/kernel/syscalls.S
- arch/sh/include/asm/unistd_32.h
- arch/sh/include/asm/unistd_64.h
- arch/sh/kernel/syscalls_32.S
- arch/sh/kernel/syscalls_64.S
- arch/sparc/include/asm/unistd.h
- arch/sparc/kernel/systbls_32.S
- arch/sparc/kernel/systbls_64.S
- arch/x86/ia32/ia32entry.S
- arch/x86/include/asm/unistd_32.h
- arch/x86/include/asm/unistd_64.h
- arch/x86/kernel/syscall_table_32.S
- arch/xtensa/include/asm/unistd.h
- include/asm-generic/unistd.h
arch/alpha/include/asm/unistd.h
... | ... | @@ -456,10 +456,11 @@ |
456 | 456 | #define __NR_open_by_handle_at 498 |
457 | 457 | #define __NR_clock_adjtime 499 |
458 | 458 | #define __NR_syncfs 500 |
459 | +#define __NR_setns 501 | |
459 | 460 | |
460 | 461 | #ifdef __KERNEL__ |
461 | 462 | |
462 | -#define NR_SYSCALLS 501 | |
463 | +#define NR_SYSCALLS 502 | |
463 | 464 | |
464 | 465 | #define __ARCH_WANT_IPC_PARSE_VERSION |
465 | 466 | #define __ARCH_WANT_OLD_READDIR |
arch/alpha/kernel/systbls.S
arch/arm/include/asm/unistd.h
... | ... | @@ -401,6 +401,7 @@ |
401 | 401 | #define __NR_clock_adjtime (__NR_SYSCALL_BASE+372) |
402 | 402 | #define __NR_syncfs (__NR_SYSCALL_BASE+373) |
403 | 403 | #define __NR_sendmmsg (__NR_SYSCALL_BASE+374) |
404 | +#define __NR_setns (__NR_SYSCALL_BASE+375) | |
404 | 405 | |
405 | 406 | /* |
406 | 407 | * The following SWIs are ARM private. |
arch/arm/kernel/calls.S
arch/avr32/include/asm/unistd.h
... | ... | @@ -299,9 +299,10 @@ |
299 | 299 | #define __NR_signalfd 279 |
300 | 300 | /* 280 was __NR_timerfd */ |
301 | 301 | #define __NR_eventfd 281 |
302 | +#define __NR_setns 283 | |
302 | 303 | |
303 | 304 | #ifdef __KERNEL__ |
304 | -#define NR_syscalls 282 | |
305 | +#define NR_syscalls 284 | |
305 | 306 | |
306 | 307 | /* Old stuff */ |
307 | 308 | #define __IGNORE_uselib |
arch/avr32/kernel/syscall_table.S
arch/blackfin/include/asm/unistd.h
... | ... | @@ -397,8 +397,9 @@ |
397 | 397 | #define __NR_open_by_handle_at 376 |
398 | 398 | #define __NR_clock_adjtime 377 |
399 | 399 | #define __NR_syncfs 378 |
400 | +#define __NR_setns 379 | |
400 | 401 | |
401 | -#define __NR_syscall 379 | |
402 | +#define __NR_syscall 380 | |
402 | 403 | #define NR_syscalls __NR_syscall |
403 | 404 | |
404 | 405 | /* Old optional stuff no one actually uses */ |
arch/blackfin/mach-common/entry.S
arch/cris/arch-v10/kernel/entry.S
arch/cris/arch-v32/kernel/entry.S
arch/cris/include/asm/unistd.h
... | ... | @@ -339,10 +339,11 @@ |
339 | 339 | #define __NR_inotify_init1 332 |
340 | 340 | #define __NR_preadv 333 |
341 | 341 | #define __NR_pwritev 334 |
342 | +#define __NR_setns 335 | |
342 | 343 | |
343 | 344 | #ifdef __KERNEL__ |
344 | 345 | |
345 | -#define NR_syscalls 335 | |
346 | +#define NR_syscalls 336 | |
346 | 347 | |
347 | 348 | #include <arch/unistd.h> |
348 | 349 |
arch/frv/include/asm/unistd.h
... | ... | @@ -343,10 +343,11 @@ |
343 | 343 | #define __NR_pwritev 334 |
344 | 344 | #define __NR_rt_tgsigqueueinfo 335 |
345 | 345 | #define __NR_perf_event_open 336 |
346 | +#define __NR_setns 337 | |
346 | 347 | |
347 | 348 | #ifdef __KERNEL__ |
348 | 349 | |
349 | -#define NR_syscalls 337 | |
350 | +#define NR_syscalls 338 | |
350 | 351 | |
351 | 352 | #define __ARCH_WANT_IPC_PARSE_VERSION |
352 | 353 | /* #define __ARCH_WANT_OLD_READDIR */ |
arch/frv/kernel/entry.S
arch/h8300/include/asm/unistd.h
... | ... | @@ -325,10 +325,11 @@ |
325 | 325 | #define __NR_move_pages 317 |
326 | 326 | #define __NR_getcpu 318 |
327 | 327 | #define __NR_epoll_pwait 319 |
328 | +#define __NR_setns 320 | |
328 | 329 | |
329 | 330 | #ifdef __KERNEL__ |
330 | 331 | |
331 | -#define NR_syscalls 320 | |
332 | +#define NR_syscalls 321 | |
332 | 333 | |
333 | 334 | #define __ARCH_WANT_IPC_PARSE_VERSION |
334 | 335 | #define __ARCH_WANT_OLD_READDIR |
arch/h8300/kernel/syscalls.S
... | ... | @@ -333,6 +333,7 @@ |
333 | 333 | .long SYMBOL_NAME(sys_ni_syscall) /* sys_move_pages */ |
334 | 334 | .long SYMBOL_NAME(sys_getcpu) |
335 | 335 | .long SYMBOL_NAME(sys_ni_syscall) /* sys_epoll_pwait */ |
336 | + .long SYMBOL_NAME(sys_setns) /* 320 */ | |
336 | 337 | |
337 | 338 | .macro call_sp addr |
338 | 339 | mov.l #SYMBOL_NAME(\addr),er6 |
arch/ia64/include/asm/unistd.h
... | ... | @@ -319,11 +319,12 @@ |
319 | 319 | #define __NR_open_by_handle_at 1327 |
320 | 320 | #define __NR_clock_adjtime 1328 |
321 | 321 | #define __NR_syncfs 1329 |
322 | +#define __NR_setns 1330 | |
322 | 323 | |
323 | 324 | #ifdef __KERNEL__ |
324 | 325 | |
325 | 326 | |
326 | -#define NR_syscalls 306 /* length of syscall table */ | |
327 | +#define NR_syscalls 307 /* length of syscall table */ | |
327 | 328 | |
328 | 329 | /* |
329 | 330 | * The following defines stop scripts/checksyscalls.sh from complaining about |
arch/ia64/kernel/entry.S
... | ... | @@ -1775,6 +1775,7 @@ |
1775 | 1775 | data8 sys_open_by_handle_at |
1776 | 1776 | data8 sys_clock_adjtime |
1777 | 1777 | data8 sys_syncfs |
1778 | + data8 sys_setns // 1330 | |
1778 | 1779 | |
1779 | 1780 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls |
1780 | 1781 | #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ |
arch/m32r/include/asm/unistd.h
... | ... | @@ -330,10 +330,11 @@ |
330 | 330 | /* #define __NR_timerfd 322 removed */ |
331 | 331 | #define __NR_eventfd 323 |
332 | 332 | #define __NR_fallocate 324 |
333 | +#define __NR_setns 325 | |
333 | 334 | |
334 | 335 | #ifdef __KERNEL__ |
335 | 336 | |
336 | -#define NR_syscalls 325 | |
337 | +#define NR_syscalls 326 | |
337 | 338 | |
338 | 339 | #define __ARCH_WANT_IPC_PARSE_VERSION |
339 | 340 | #define __ARCH_WANT_STAT64 |
arch/m32r/kernel/syscall_table.S
arch/m68k/include/asm/unistd.h
... | ... | @@ -349,10 +349,11 @@ |
349 | 349 | #define __NR_open_by_handle_at 341 |
350 | 350 | #define __NR_clock_adjtime 342 |
351 | 351 | #define __NR_syncfs 343 |
352 | +#define __NR_setns 344 | |
352 | 353 | |
353 | 354 | #ifdef __KERNEL__ |
354 | 355 | |
355 | -#define NR_syscalls 344 | |
356 | +#define NR_syscalls 345 | |
356 | 357 | |
357 | 358 | #define __ARCH_WANT_IPC_PARSE_VERSION |
358 | 359 | #define __ARCH_WANT_OLD_READDIR |
arch/m68k/kernel/syscalltable.S
arch/microblaze/include/asm/unistd.h
... | ... | @@ -390,8 +390,9 @@ |
390 | 390 | #define __NR_open_by_handle_at 372 |
391 | 391 | #define __NR_clock_adjtime 373 |
392 | 392 | #define __NR_syncfs 374 |
393 | +#define __NR_setns 375 | |
393 | 394 | |
394 | -#define __NR_syscalls 375 | |
395 | +#define __NR_syscalls 376 | |
395 | 396 | |
396 | 397 | #ifdef __KERNEL__ |
397 | 398 | #ifndef __ASSEMBLY__ |
arch/microblaze/kernel/syscall_table.S
arch/mips/include/asm/unistd.h
... | ... | @@ -363,16 +363,17 @@ |
363 | 363 | #define __NR_open_by_handle_at (__NR_Linux + 340) |
364 | 364 | #define __NR_clock_adjtime (__NR_Linux + 341) |
365 | 365 | #define __NR_syncfs (__NR_Linux + 342) |
366 | +#define __NR_setns (__NR_Linux + 343) | |
366 | 367 | |
367 | 368 | /* |
368 | 369 | * Offset of the last Linux o32 flavoured syscall |
369 | 370 | */ |
370 | -#define __NR_Linux_syscalls 342 | |
371 | +#define __NR_Linux_syscalls 343 | |
371 | 372 | |
372 | 373 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ |
373 | 374 | |
374 | 375 | #define __NR_O32_Linux 4000 |
375 | -#define __NR_O32_Linux_syscalls 342 | |
376 | +#define __NR_O32_Linux_syscalls 343 | |
376 | 377 | |
377 | 378 | #if _MIPS_SIM == _MIPS_SIM_ABI64 |
378 | 379 | |
379 | 380 | |
380 | 381 | |
... | ... | @@ -682,16 +683,17 @@ |
682 | 683 | #define __NR_open_by_handle_at (__NR_Linux + 299) |
683 | 684 | #define __NR_clock_adjtime (__NR_Linux + 300) |
684 | 685 | #define __NR_syncfs (__NR_Linux + 301) |
686 | +#define __NR_setns (__NR_Linux + 302) | |
685 | 687 | |
686 | 688 | /* |
687 | 689 | * Offset of the last Linux 64-bit flavoured syscall |
688 | 690 | */ |
689 | -#define __NR_Linux_syscalls 301 | |
691 | +#define __NR_Linux_syscalls 302 | |
690 | 692 | |
691 | 693 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ |
692 | 694 | |
693 | 695 | #define __NR_64_Linux 5000 |
694 | -#define __NR_64_Linux_syscalls 301 | |
696 | +#define __NR_64_Linux_syscalls 302 | |
695 | 697 | |
696 | 698 | #if _MIPS_SIM == _MIPS_SIM_NABI32 |
697 | 699 | |
698 | 700 | |
699 | 701 | |
... | ... | @@ -1006,16 +1008,17 @@ |
1006 | 1008 | #define __NR_open_by_handle_at (__NR_Linux + 304) |
1007 | 1009 | #define __NR_clock_adjtime (__NR_Linux + 305) |
1008 | 1010 | #define __NR_syncfs (__NR_Linux + 306) |
1011 | +#define __NR_setns (__NR_Linux + 307) | |
1009 | 1012 | |
1010 | 1013 | /* |
1011 | 1014 | * Offset of the last N32 flavoured syscall |
1012 | 1015 | */ |
1013 | -#define __NR_Linux_syscalls 306 | |
1016 | +#define __NR_Linux_syscalls 307 | |
1014 | 1017 | |
1015 | 1018 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ |
1016 | 1019 | |
1017 | 1020 | #define __NR_N32_Linux 6000 |
1018 | -#define __NR_N32_Linux_syscalls 306 | |
1021 | +#define __NR_N32_Linux_syscalls 307 | |
1019 | 1022 | |
1020 | 1023 | #ifdef __KERNEL__ |
1021 | 1024 |
arch/mips/kernel/scall32-o32.S
arch/mips/kernel/scall64-64.S
arch/mips/kernel/scall64-n32.S
arch/mips/kernel/scall64-o32.S
arch/mn10300/include/asm/unistd.h
... | ... | @@ -349,10 +349,11 @@ |
349 | 349 | #define __NR_rt_tgsigqueueinfo 336 |
350 | 350 | #define __NR_perf_event_open 337 |
351 | 351 | #define __NR_recvmmsg 338 |
352 | +#define __NR_setns 339 | |
352 | 353 | |
353 | 354 | #ifdef __KERNEL__ |
354 | 355 | |
355 | -#define NR_syscalls 339 | |
356 | +#define NR_syscalls 340 | |
356 | 357 | |
357 | 358 | /* |
358 | 359 | * specify the deprecated syscalls we want to support on this arch |
arch/mn10300/kernel/entry.S
arch/parisc/include/asm/unistd.h
... | ... | @@ -820,8 +820,9 @@ |
820 | 820 | #define __NR_name_to_handle_at (__NR_Linux + 325) |
821 | 821 | #define __NR_open_by_handle_at (__NR_Linux + 326) |
822 | 822 | #define __NR_syncfs (__NR_Linux + 327) |
823 | +#define __NR_setns (__NR_Linux + 328) | |
823 | 824 | |
824 | -#define __NR_Linux_syscalls (__NR_syncfs + 1) | |
825 | +#define __NR_Linux_syscalls (__NR_setns + 1) | |
825 | 826 | |
826 | 827 | |
827 | 828 | #define __IGNORE_select /* newselect */ |
arch/parisc/kernel/syscall_table.S
arch/powerpc/include/asm/systbl.h
arch/powerpc/include/asm/unistd.h
... | ... | @@ -372,10 +372,11 @@ |
372 | 372 | #define __NR_clock_adjtime 347 |
373 | 373 | #define __NR_syncfs 348 |
374 | 374 | #define __NR_sendmmsg 349 |
375 | +#define __NR_setns 350 | |
375 | 376 | |
376 | 377 | #ifdef __KERNEL__ |
377 | 378 | |
378 | -#define __NR_syscalls 350 | |
379 | +#define __NR_syscalls 351 | |
379 | 380 | |
380 | 381 | #define __NR__exit __NR_exit |
381 | 382 | #define NR_syscalls __NR_syscalls |
arch/s390/include/asm/unistd.h
... | ... | @@ -276,7 +276,8 @@ |
276 | 276 | #define __NR_open_by_handle_at 336 |
277 | 277 | #define __NR_clock_adjtime 337 |
278 | 278 | #define __NR_syncfs 338 |
279 | -#define NR_syscalls 339 | |
279 | +#define __NR_setns 339 | |
280 | +#define NR_syscalls 340 | |
280 | 281 | |
281 | 282 | /* |
282 | 283 | * There are some system calls that are not present on 64 bit, some |
arch/s390/kernel/compat_wrapper.S
arch/s390/kernel/syscalls.S
... | ... | @@ -347,4 +347,5 @@ |
347 | 347 | SYSCALL(sys_open_by_handle_at,sys_open_by_handle_at,compat_sys_open_by_handle_at_wrapper) |
348 | 348 | SYSCALL(sys_clock_adjtime,sys_clock_adjtime,compat_sys_clock_adjtime_wrapper) |
349 | 349 | SYSCALL(sys_syncfs,sys_syncfs,sys_syncfs_wrapper) |
350 | +SYSCALL(sys_setns,sys_setns,sys_setns_wrapper) |
arch/sh/include/asm/unistd_32.h
arch/sh/include/asm/unistd_64.h
... | ... | @@ -395,10 +395,11 @@ |
395 | 395 | #define __NR_clock_adjtime 372 |
396 | 396 | #define __NR_syncfs 373 |
397 | 397 | #define __NR_sendmmsg 374 |
398 | +#define __NR_setns 375 | |
398 | 399 | |
399 | 400 | #ifdef __KERNEL__ |
400 | 401 | |
401 | -#define NR_syscalls 375 | |
402 | +#define NR_syscalls 376 | |
402 | 403 | |
403 | 404 | #define __ARCH_WANT_IPC_PARSE_VERSION |
404 | 405 | #define __ARCH_WANT_OLD_READDIR |
arch/sh/kernel/syscalls_32.S
arch/sh/kernel/syscalls_64.S
arch/sparc/include/asm/unistd.h
... | ... | @@ -405,8 +405,9 @@ |
405 | 405 | #define __NR_clock_adjtime 334 |
406 | 406 | #define __NR_syncfs 335 |
407 | 407 | #define __NR_sendmmsg 336 |
408 | +#define __NR_setns 337 | |
408 | 409 | |
409 | -#define NR_syscalls 337 | |
410 | +#define NR_syscalls 338 | |
410 | 411 | |
411 | 412 | #ifdef __32bit_syscall_numbers__ |
412 | 413 | /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants, |
arch/sparc/kernel/systbls_32.S
... | ... | @@ -84,5 +84,5 @@ |
84 | 84 | /*320*/ .long sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv |
85 | 85 | /*325*/ .long sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_event_open, sys_recvmmsg, sys_fanotify_init |
86 | 86 | /*330*/ .long sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime |
87 | -/*335*/ .long sys_syncfs, sys_sendmmsg | |
87 | +/*335*/ .long sys_syncfs, sys_sendmmsg, sys_setns |
arch/sparc/kernel/systbls_64.S
... | ... | @@ -85,7 +85,7 @@ |
85 | 85 | /*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, compat_sys_preadv |
86 | 86 | .word compat_sys_pwritev, compat_sys_rt_tgsigqueueinfo, sys_perf_event_open, compat_sys_recvmmsg, sys_fanotify_init |
87 | 87 | /*330*/ .word sys32_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, compat_sys_open_by_handle_at, compat_sys_clock_adjtime |
88 | - .word sys_syncfs, compat_sys_sendmmsg | |
88 | + .word sys_syncfs, compat_sys_sendmmsg, sys_setns | |
89 | 89 | |
90 | 90 | #endif /* CONFIG_COMPAT */ |
91 | 91 | |
... | ... | @@ -162,5 +162,5 @@ |
162 | 162 | /*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv |
163 | 163 | .word sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_event_open, sys_recvmmsg, sys_fanotify_init |
164 | 164 | /*330*/ .word sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime |
165 | - .word sys_syncfs, sys_sendmmsg | |
165 | + .word sys_syncfs, sys_sendmmsg, sys_setns |
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/unistd_32.h
... | ... | @@ -351,10 +351,11 @@ |
351 | 351 | #define __NR_clock_adjtime 343 |
352 | 352 | #define __NR_syncfs 344 |
353 | 353 | #define __NR_sendmmsg 345 |
354 | +#define __NR_setns 346 | |
354 | 355 | |
355 | 356 | #ifdef __KERNEL__ |
356 | 357 | |
357 | -#define NR_syscalls 346 | |
358 | +#define NR_syscalls 347 | |
358 | 359 | |
359 | 360 | #define __ARCH_WANT_IPC_PARSE_VERSION |
360 | 361 | #define __ARCH_WANT_OLD_READDIR |
arch/x86/include/asm/unistd_64.h
arch/x86/kernel/syscall_table_32.S
arch/xtensa/include/asm/unistd.h
... | ... | @@ -683,8 +683,10 @@ |
683 | 683 | __SYSCALL(306, sys_eventfd, 1) |
684 | 684 | #define __NR_recvmmsg 307 |
685 | 685 | __SYSCALL(307, sys_recvmmsg, 5) |
686 | +#define __NR_setns 308 | |
687 | +__SYSCALL(308, sys_setns, 2) | |
686 | 688 | |
687 | -#define __NR_syscall_count 308 | |
689 | +#define __NR_syscall_count 309 | |
688 | 690 | |
689 | 691 | /* |
690 | 692 | * sysxtensa syscall handler |
include/asm-generic/unistd.h
... | ... | @@ -681,9 +681,11 @@ |
681 | 681 | __SC_COMP(__NR_clock_adjtime, sys_clock_adjtime, compat_sys_clock_adjtime) |
682 | 682 | #define __NR_syncfs 267 |
683 | 683 | __SYSCALL(__NR_syncfs, sys_syncfs) |
684 | +#define __NR_setns 268 | |
685 | +__SYSCALL(__NR_setns, sys_setns) | |
684 | 686 | |
685 | 687 | #undef __NR_syscalls |
686 | -#define __NR_syscalls 268 | |
688 | +#define __NR_syscalls 269 | |
687 | 689 | |
688 | 690 | /* |
689 | 691 | * All syscalls below here should go away really, |