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

Commit b34d8915 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'writable_limits' of git://decibel.fi.muni.cz/~xslaby/linux 

* 'writable_limits' of git://decibel.fi.muni.cz/~xslaby/linux:
  unistd: add __NR_prlimit64 syscall numbers
  rlimits: implement prlimit64 syscall
  rlimits: switch more rlimit syscalls to do_prlimit
  rlimits: redo do_setrlimit to more generic do_prlimit
  rlimits: add rlimit64 structure
  rlimits: do security check under task_lock
  rlimits: allow setrlimit to non-current tasks
  rlimits: split sys_setrlimit
  rlimits: selinux, do rlimits changes under task_lock
  rlimits: make sure ->rlim_max never grows in sys_setrlimit
  rlimits: add task_struct to update_rlimit_cpu
  rlimits: security, add task_struct to setrlimit

Fix up various system call number conflicts.  We not only added fanotify
system calls in the meantime, but asm-generic/unistd.h added a wait4
along with a range of reserved per-architecture system calls.
parents e8a89ceb f33ebbe9

arch/x86/ia32/ia32entry.S

+1 −0
Original line number Diff line number Diff line
@@ -844,4 +844,5 @@ ia32_sys_call_table: 
	.quad compat_sys_recvmmsg

	.quad sys_fanotify_init

	.quad sys32_fanotify_mark

	.quad sys_prlimit64

ia32_syscall_end:

arch/x86/include/asm/unistd_32.h

+2 −1
Original line number Diff line number Diff line
@@ -345,10 +345,11 @@ 
#define __NR_recvmmsg		337

#define __NR_fanotify_init	338

#define __NR_fanotify_mark	339

#define __NR_prlimit64		340



#ifdef __KERNEL__



#define NR_syscalls 340

#define NR_syscalls 341



#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

arch/x86/include/asm/unistd_64.h

+2 −0
Original line number Diff line number Diff line
@@ -667,6 +667,8 @@ __SYSCALL(__NR_recvmmsg, sys_recvmmsg) 
__SYSCALL(__NR_fanotify_init, sys_fanotify_init)

#define __NR_fanotify_mark			301

__SYSCALL(__NR_fanotify_mark, sys_fanotify_mark)

#define __NR_prlimit64				302

__SYSCALL(__NR_prlimit64, sys_prlimit64)



#ifndef __NO_STUBS

#define __ARCH_WANT_OLD_READDIR

arch/x86/kernel/syscall_table_32.S

+1 −0
Original line number Diff line number Diff line
@@ -339,3 +339,4 @@ ENTRY(sys_call_table) 
	.long sys_recvmmsg

	.long sys_fanotify_init

	.long sys_fanotify_mark

	.long sys_prlimit64

include/asm-generic/unistd.h

+3 −1
Original line number Diff line number Diff line
@@ -640,9 +640,11 @@ __SYSCALL(__NR_recvmmsg, sys_recvmmsg) 


#define __NR_wait4 260

__SYSCALL(__NR_wait4, sys_wait4)

#define __NR_prlimit64 261

__SYSCALL(__NR_prlimit64, sys_prlimit64)



#undef __NR_syscalls

#define __NR_syscalls 261

#define __NR_syscalls 262



/*

 * All syscalls below here should go away really,