History

Merge 3.7-rc6 into tty-next

Greg Kroah-Hartman committed 14 years ago

Commit 1e619a12 parents 68a8129 f4a75d2182 files · +2500 −957Browse files

Showing the changes to include/uapi (1 of 182 files). Show all

Unified · Split

include/uapi/linux/oom.h+9−0
@@ -8,4 +8,13 @@ · 7 unmodified lines
8#define OOM_SCORE_ADJ_MIN (-1000)8#define OOM_SCORE_ADJ_MIN (-1000)
9#define OOM_SCORE_ADJ_MAX 10009#define OOM_SCORE_ADJ_MAX 1000
10 10
11/*
12 * /proc/<pid>/oom_adj set to -17 protects from the oom killer for legacy
13 * purposes.
14 */
15#define OOM_DISABLE (-17)
16/* inclusive */
17#define OOM_ADJUST_MIN (-16)
18#define OOM_ADJUST_MAX 15
19
11#endif /* _UAPI__INCLUDE_LINUX_OOM_H */20#endif /* _UAPI__INCLUDE_LINUX_OOM_H */