Commit 571503e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 29a6ccca 7b21fddd

arch/alpha/include/asm/unistd.h

+2 −1
Original line number Diff line number Diff line
@@ -456,10 +456,11 @@ 
#define __NR_open_by_handle_at		498

#define __NR_clock_adjtime		499

#define __NR_syncfs			500

#define __NR_setns			501



#ifdef __KERNEL__



#define NR_SYSCALLS			501

#define NR_SYSCALLS			502



#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

arch/alpha/kernel/systbls.S

+1 −0
Original line number Diff line number Diff line
@@ -519,6 +519,7 @@ sys_call_table: 
	.quad sys_open_by_handle_at

	.quad sys_clock_adjtime

	.quad sys_syncfs			/* 500 */

	.quad sys_setns



	.size sys_call_table, . - sys_call_table

	.type sys_call_table, @object

arch/arm/include/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -401,6 +401,7 @@ 
#define __NR_clock_adjtime		(__NR_SYSCALL_BASE+372)

#define __NR_syncfs			(__NR_SYSCALL_BASE+373)

#define __NR_sendmmsg			(__NR_SYSCALL_BASE+374)

#define __NR_setns			(__NR_SYSCALL_BASE+375)



/*

 * The following SWIs are ARM private.

arch/arm/kernel/calls.S

+1 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ 
		CALL(sys_clock_adjtime)

		CALL(sys_syncfs)

		CALL(sys_sendmmsg)

/* 375 */	CALL(sys_setns)

#ifndef syscalls_counted

.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls

#define syscalls_counted

arch/avr32/include/asm/unistd.h

+2 −1
Original line number Diff line number Diff line
@@ -299,9 +299,10 @@ 
#define __NR_signalfd		279

/* 280 was __NR_timerfd */

#define __NR_eventfd		281

#define __NR_setns		283



#ifdef __KERNEL__

#define NR_syscalls		282

#define NR_syscalls		284



/* Old stuff */

#define __IGNORE_uselib