Merge 3.7-rc6 into tty-next

This commit is contained in:
Greg Kroah-Hartman 2012-11-16 18:26:00 -08:00
commit 1e619a1bf9
182 changed files with 2522 additions and 979 deletions

View file

@ -8,4 +8,13 @@
#define OOM_SCORE_ADJ_MIN (-1000)
#define OOM_SCORE_ADJ_MAX 1000
/*
* /proc/<pid>/oom_adj set to -17 protects from the oom killer for legacy
* purposes.
*/
#define OOM_DISABLE (-17)
/* inclusive */
#define OOM_ADJUST_MIN (-16)
#define OOM_ADJUST_MAX 15
#endif /* _UAPI__INCLUDE_LINUX_OOM_H */