diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-21 03:00:25 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-21 03:00:25 -0500 |
| commit | 3f6f1cd6ffb473f426858692e8e1cb82aea137eb (patch) | |
| tree | d3f3f931d3ed57041dc0feafb8fdbf9843fcb5fc /include/uapi/linux/oom.h | |
| parent | 1443f8a0b95c07cee9df4420a30eea24123af3f3 (diff) | |
| parent | b57870e28d27561ea5bad538c22b7d10f531b35c (diff) | |
Merge branch 'armsoc/board' of git://github.com/hzhuang1/linux into next/boards
From Haojian Zhuang:
* 'armsoc/board' of git://github.com/hzhuang1/linux:
ARM: mmp: select pinctrl driver
+ Linux 3.7-rc6
Diffstat (limited to 'include/uapi/linux/oom.h')
| -rw-r--r-- | include/uapi/linux/oom.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/uapi/linux/oom.h b/include/uapi/linux/oom.h index a49c4afc7060..b29272d621ce 100644 --- a/include/uapi/linux/oom.h +++ b/include/uapi/linux/oom.h | |||
| @@ -8,4 +8,13 @@ | |||
| 8 | #define OOM_SCORE_ADJ_MIN (-1000) | 8 | #define OOM_SCORE_ADJ_MIN (-1000) |
| 9 | #define OOM_SCORE_ADJ_MAX 1000 | 9 | #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 */ |