diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-21 00:01:51 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-21 00:01:51 -0800 |
| commit | 2054271bb008de0bcf0bdc5d6041613f616420f2 (patch) | |
| tree | 24e638944597399d28c0432a5f6a323d3181c8a6 /include/uapi/linux | |
| parent | 12480c2e53d355223cf6884ed1f56e6ac9b7c21f (diff) | |
| parent | 8757e168190a6ed2cd4aa23fc59bf86b0091b596 (diff) | |
Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non-critical
From Haojian Zhuang:
* 'armsoc/fix' of git://github.com/hzhuang1/linux:
ARM: pxa: fix pxa25x gpio wakeup setting
+ Linux 3.7-rc6
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/eventpoll.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/oom.h | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/uapi/linux/eventpoll.h b/include/uapi/linux/eventpoll.h index 8c99ce7202c5..2c267bcbb85c 100644 --- a/include/uapi/linux/eventpoll.h +++ b/include/uapi/linux/eventpoll.h @@ -25,7 +25,6 @@ #define EPOLL_CTL_ADD 1 #define EPOLL_CTL_DEL 2 #define EPOLL_CTL_MOD 3 -#define EPOLL_CTL_DISABLE 4 /* * Request the handling of system wakeup events so as to prevent system suspends 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 @@ #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 */ |