diff options
author | 2019-02-11 09:26:45 +0100 | |
---|---|---|
committer | 2019-02-11 09:26:45 +0100 | |
commit | c744ca39f28f9a1e94a62ba02483619925d25ddc (patch) | |
tree | bfcd445d31c88130cb0833675e2c7ea1c40f47e0 /include/linux/sched/coredump.h | |
parent | serial: max310x: Correction of the initial setting of the MODE1 bits for various supported ICs. (diff) | |
parent | Linux 5.0-rc6 (diff) | |
download | wireguard-linux-c744ca39f28f9a1e94a62ba02483619925d25ddc.tar.xz wireguard-linux-c744ca39f28f9a1e94a62ba02483619925d25ddc.zip |
Merge 5.0-rc6 into tty-next
We need the tty fixes in here for other patches to be based on.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/sched/coredump.h')
-rw-r--r-- | include/linux/sched/coredump.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sched/coredump.h b/include/linux/sched/coredump.h index ec912d01126f..ecdc6542070f 100644 --- a/include/linux/sched/coredump.h +++ b/include/linux/sched/coredump.h @@ -71,6 +71,7 @@ static inline int get_dumpable(struct mm_struct *mm) #define MMF_HUGE_ZERO_PAGE 23 /* mm has ever used the global huge zero page */ #define MMF_DISABLE_THP 24 /* disable THP for all VMAs */ #define MMF_OOM_VICTIM 25 /* mm is the oom victim */ +#define MMF_OOM_REAP_QUEUED 26 /* mm was queued for oom_reaper */ #define MMF_DISABLE_THP_MASK (1 << MMF_DISABLE_THP) #define MMF_INIT_MASK (MMF_DUMPABLE_MASK | MMF_DUMP_FILTER_MASK |\ |