Merge branch 'for-linus' into for-next

This commit is contained in:
Takashi Iwai 2012-11-22 21:22:39 +01:00
commit 2ba509a6ba
178 changed files with 1955 additions and 988 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 */