Minor line offset auto-merges.
Showing the changes to include/uapi (2 of 384 files). Show all
Unified · Split
| @@ -25,7 +25,6 @@ · 24 unmodified lines | ||
| 25 | 25 | #define EPOLL_CTL_ADD 1 |
| 26 | 26 | #define EPOLL_CTL_DEL 2 |
| 27 | 27 | #define EPOLL_CTL_MOD 3 |
| 28 | −#define EPOLL_CTL_DISABLE 4 | |
| 29 | 28 | |
| 30 | 29 | /* |
| 31 | 30 | * Request the handling of system wakeup events so as to prevent system suspends |
| @@ -8,4 +8,13 @@ · 7 unmodified lines | ||
| 8 | 8 | #define OOM_SCORE_ADJ_MIN (-1000) |
| 9 | 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 | 20 | #endif /* _UAPI__INCLUDE_LINUX_OOM_H */ |