Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ccce2b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Hook up process_vm_{readv,writev} syscalls.
parents dccefb37 51ce185a

arch/sparc/include/asm/unistd.h

+3 −1
Original line number Diff line number Diff line
@@ -406,8 +406,10 @@ 
#define __NR_syncfs		335

#define __NR_sendmmsg		336

#define __NR_setns		337

#define __NR_process_vm_readv	338

#define __NR_process_vm_writev	339



#define NR_syscalls		338

#define NR_syscalls		340



#ifdef __32bit_syscall_numbers__

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

arch/sparc/kernel/systbls_32.S

+1 −1
Original line number Diff line number Diff line
@@ -84,4 +84,4 @@ sys_call_table: 
/*320*/	.long sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv

/*325*/	.long sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_event_open, sys_recvmmsg, sys_fanotify_init

/*330*/	.long sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime

/*335*/	.long sys_syncfs, sys_sendmmsg, sys_setns
 
/*335*/	.long sys_syncfs, sys_sendmmsg, sys_setns, sys_process_vm_readv, sys_process_vm_writev

arch/sparc/kernel/systbls_64.S

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ sys_call_table32: 
/*320*/	.word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, compat_sys_preadv

	.word compat_sys_pwritev, compat_sys_rt_tgsigqueueinfo, sys_perf_event_open, compat_sys_recvmmsg, sys_fanotify_init

/*330*/	.word sys32_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, compat_sys_open_by_handle_at, compat_sys_clock_adjtime

	.word sys_syncfs, compat_sys_sendmmsg, sys_setns

	.word sys_syncfs, compat_sys_sendmmsg, sys_setns, compat_sys_process_vm_readv, compat_sys_process_vm_writev



#endif /* CONFIG_COMPAT */
@@ -162,4 +162,4 @@ sys_call_table: 
/*320*/	.word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv

	.word sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_event_open, sys_recvmmsg, sys_fanotify_init

/*330*/	.word sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime

	.word sys_syncfs, sys_sendmmsg, sys_setns
 
	.word sys_syncfs, sys_sendmmsg, sys_setns, sys_process_vm_readv, sys_process_vm_writev