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

Browse source

* 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux:
  resource: add helpers for fetching rlimits
  resource: move kernel function inside __KERNEL__
  SECURITY: selinux, fix update_rlimit_cpu parameter

...

This commit is contained in:

Linus Torvalds 2010-01-04 12:36:54 -08:00

parent 14107c750b 3e10e716ab

commit c5974b835a

3 changed files with 29 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

include/linux/resource.h

View file

22

include/linux/sched.h

View file

2

security/selinux/hooks.c

View file