Commit 7b35fa86 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: Wire up new system calls.
parents 29ca069c f1373da8

arch/sparc/kernel/systbls.S

+2 −1
Original line number Diff line number Diff line
@@ -80,4 +80,5 @@ sys_call_table: 
/*300*/	.long sys_set_robust_list, sys_get_robust_list, sys_migrate_pages, sys_mbind, sys_get_mempolicy

/*305*/	.long sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait

/*310*/	.long sys_utimensat, sys_signalfd, sys_timerfd_create, sys_eventfd, sys_fallocate

/*315*/	.long sys_timerfd_settime, sys_timerfd_gettime
 
/*315*/	.long sys_timerfd_settime, sys_timerfd_gettime, sys_signalfd4, sys_eventfd2, sys_epoll_create1

/*320*/	.long sys_dup3, sys_pipe2, sys_inotify_init1

arch/sparc64/kernel/systbls.S

+4 −2
Original line number Diff line number Diff line
@@ -81,7 +81,8 @@ sys_call_table32: 
/*300*/	.word compat_sys_set_robust_list, compat_sys_get_robust_list, compat_sys_migrate_pages, compat_sys_mbind, compat_sys_get_mempolicy

	.word compat_sys_set_mempolicy, compat_sys_kexec_load, compat_sys_move_pages, sys_getcpu, compat_sys_epoll_pwait

/*310*/	.word compat_sys_utimensat, compat_sys_signalfd, sys_timerfd_create, sys_eventfd, compat_sys_fallocate

	.word compat_sys_timerfd_settime, compat_sys_timerfd_gettime

	.word compat_sys_timerfd_settime, compat_sys_timerfd_gettime, compat_sys_signalfd4, sys_eventfd2, sys_epoll_create1

/*320*/	.word sys_dup3, sys_pipe2, sys_inotify_init1



#endif /* CONFIG_COMPAT */
@@ -154,4 +155,5 @@ sys_call_table: 
/*300*/	.word sys_set_robust_list, sys_get_robust_list, sys_migrate_pages, sys_mbind, sys_get_mempolicy

	.word sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait

/*310*/	.word sys_utimensat, sys_signalfd, sys_timerfd_create, sys_eventfd, sys_fallocate

	.word sys_timerfd_settime, sys_timerfd_gettime
 
	.word sys_timerfd_settime, sys_timerfd_gettime, sys_signalfd4, sys_eventfd2, sys_epoll_create1

/*320*/	.word sys_dup3, sys_pipe2, sys_inotify_init1

include/asm-sparc/unistd_32.h

+7 −1
Original line number Diff line number Diff line
@@ -332,8 +332,14 @@ 
#define __NR_fallocate		314

#define __NR_timerfd_settime	315

#define __NR_timerfd_gettime	316

#define __NR_signalfd4		317

#define __NR_eventfd2		318

#define __NR_epoll_create1	319

#define __NR_dup3		320

#define __NR_pipe2		321

#define __NR_inotify_init1	322



#define NR_SYSCALLS		317

#define NR_SYSCALLS		323



/* Sparc 32-bit only has the "setresuid32", "getresuid32" variants,

 * it never had the plain ones and there is no value to adding those

include/asm-sparc/unistd_64.h

+7 −1
Original line number Diff line number Diff line
@@ -334,8 +334,14 @@ 
#define __NR_fallocate		314

#define __NR_timerfd_settime	315

#define __NR_timerfd_gettime	316

#define __NR_signalfd4		317

#define __NR_eventfd2		318

#define __NR_epoll_create1	319

#define __NR_dup3		320

#define __NR_pipe2		321

#define __NR_inotify_init1	322



#define NR_SYSCALLS		317

#define NR_SYSCALLS		323



#ifdef __KERNEL__

#define __ARCH_WANT_IPC_PARSE_VERSION