]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'writable_limits' of git://decibel.fi.muni.cz/~xslaby/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Aug 2010 19:07:51 +0000 (12:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Aug 2010 19:07:51 +0000 (12:07 -0700)
commitb34d8915c413acb51d837a45fb8747b61f65c020
treeced5fac166324634653d84b1afe2b958b3904f4d
parente8a89cebdbaab14caaa26debdb4ffd493b8831af
parentf33ebbe9da2c3c24664a0ad4f8fd83f293547e63
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.
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
include/asm-generic/unistd.h
include/linux/security.h
include/linux/syscalls.h
kernel/posix-cpu-timers.c
security/capability.c
security/security.c
security/selinux/hooks.c