diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/oom.h | 11 | ||||
| -rw-r--r-- | include/linux/sched.h | 1 |
2 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/oom.h b/include/linux/oom.h index 49a3031fda50..d36a8221f58b 100644 --- a/include/linux/oom.h +++ b/include/linux/oom.h | |||
| @@ -2,17 +2,6 @@ | |||
| 2 | #define __INCLUDE_LINUX_OOM_H | 2 | #define __INCLUDE_LINUX_OOM_H |
| 3 | 3 | ||
| 4 | /* | 4 | /* |
| 5 | * /proc/<pid>/oom_adj is deprecated, see | ||
| 6 | * Documentation/feature-removal-schedule.txt. | ||
| 7 | * | ||
| 8 | * /proc/<pid>/oom_adj set to -17 protects from the oom-killer | ||
| 9 | */ | ||
| 10 | #define OOM_DISABLE (-17) | ||
| 11 | /* inclusive */ | ||
| 12 | #define OOM_ADJUST_MIN (-16) | ||
| 13 | #define OOM_ADJUST_MAX 15 | ||
| 14 | |||
| 15 | /* | ||
| 16 | * /proc/<pid>/oom_score_adj set to OOM_SCORE_ADJ_MIN disables oom killing for | 5 | * /proc/<pid>/oom_score_adj set to OOM_SCORE_ADJ_MIN disables oom killing for |
| 17 | * pid. | 6 | * pid. |
| 18 | */ | 7 | */ |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 9c5612f0374b..c2070e92a9d6 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -671,7 +671,6 @@ struct signal_struct { | |||
| 671 | struct rw_semaphore group_rwsem; | 671 | struct rw_semaphore group_rwsem; |
| 672 | #endif | 672 | #endif |
| 673 | 673 | ||
| 674 | int oom_adj; /* OOM kill score adjustment (bit shift) */ | ||
| 675 | int oom_score_adj; /* OOM kill score adjustment */ | 674 | int oom_score_adj; /* OOM kill score adjustment */ |
| 676 | int oom_score_adj_min; /* OOM kill score adjustment minimum value. | 675 | int oom_score_adj_min; /* OOM kill score adjustment minimum value. |
| 677 | * Only settable by CAP_SYS_RESOURCE. */ | 676 | * Only settable by CAP_SYS_RESOURCE. */ |
