diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-04 18:56:53 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-04 18:56:53 +0300 |
commit | 22a093b2fb52fb656658a32adc80c24ddc200ca4 (patch) | |
tree | d0edd1065ee10369ca204404e43bdeece71d3d5e /security/tomoyo/memory.c | |
parent | c1776a18e3b5a3559f3dff5df0ecce570abd3a9f (diff) | |
parent | 397f2378f136128623fc237746157aa2564d1082 (diff) | |
download | linux-22a093b2fb52fb656658a32adc80c24ddc200ca4.tar.xz |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"Debug info and other statistics fixes and related enhancements"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/numa: Fix numa balancing stats in /proc/pid/sched
sched/numa: Show numa_group ID in /proc/sched_debug task listings
sched/debug: Move print_cfs_rq() declaration to kernel/sched/sched.h
sched/stat: Expose /proc/pid/schedstat if CONFIG_SCHED_INFO=y
sched/stat: Simplify the sched_info accounting dependency
Diffstat (limited to 'security/tomoyo/memory.c')
0 files changed, 0 insertions, 0 deletions