This is mostly a revert of 01dc52ebdf47 ("oom: remove deprecated oom_adj") from Davidlohr Bueso. It reintroduces /proc/pid/oom_adj for backwards compatibility with earlier kernels. It simply scales the value linearly when /proc/pid/oom_score_adj is written. The major difference is that its scheduled removal is no longer included in Documentation/feature-removal-schedule.txt. We do warn users with a single printk, though, to suggest the more powerful and supported /proc/pid/oom_score_adj interface.
Showing the changes to include/uapi/linux (1 of 3 files). Show all
Unified · Split
| @@ -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 */ |