diff options
author | David Rientjes <rientjes@google.com> | 2015-09-08 15:00:39 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-08 15:35:28 -0700 |
commit | 54e9e29132d7caefcad470281cae06ac34a982c8 (patch) | |
tree | 2c0fc45f174f03f4b38920a463546570325329a7 /drivers/tty | |
parent | 6e0fc46dc2152d3e2d25a5d5b640ae3586c247c6 (diff) | |
download | linux-stable-54e9e29132d7caefcad470281cae06ac34a982c8.tar.gz linux-stable-54e9e29132d7caefcad470281cae06ac34a982c8.tar.bz2 linux-stable-54e9e29132d7caefcad470281cae06ac34a982c8.zip |
mm, oom: pass an oom order of -1 when triggered by sysrq
The force_kill member of struct oom_control isn't needed if an order of -1
is used instead. This is the same as order == -1 in struct
compact_control which requires full memory compaction.
This patch introduces no functional change.
Signed-off-by: David Rientjes <rientjes@google.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Cc: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/sysrq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index ed3e258f4ee9..95b330a9ea98 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -358,8 +358,7 @@ static void moom_callback(struct work_struct *ignored) .zonelist = node_zonelist(first_memory_node, gfp_mask), .nodemask = NULL, .gfp_mask = gfp_mask, - .order = 0, - .force_kill = true, + .order = -1, }; mutex_lock(&oom_lock); |