diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-12-08 09:25:06 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-12-08 09:25:06 -0500 |
| commit | f0b9abfb044649bc452fb2fb975ff2fd599cc6a3 (patch) | |
| tree | 7800081c5cb16a4dfee1e57a70f3be90f7b50d9a /include/uapi/linux/oom.h | |
| parent | adc1ef1e37358d3c17d1a74a58b2e104fc0bda15 (diff) | |
| parent | 1b3c393cd43f22ead8a6a2f839efc6df8ebd7465 (diff) | |
Merge branch 'linus' into perf/core
Conflicts:
tools/perf/Makefile
tools/perf/builtin-test.c
tools/perf/perf.h
tools/perf/tests/parse-events.c
tools/perf/util/evsel.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 a49c4afc706..b29272d621c 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 */ |