diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/android/lowmemorykiller.c | 2 | ||||
| -rw-r--r-- | drivers/tty/sysrq.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c index 8251171ca..eef102355 100644 --- a/drivers/staging/android/lowmemorykiller.c +++ b/drivers/staging/android/lowmemorykiller.c @@ -218,7 +218,7 @@ static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc) * infrastructure. There is no real reason why the selected * task should have access to the memory reserves. */ - mark_oom_victim(selected); + mark_tsk_oom_victim(selected); send_sig(SIGKILL, selected, 0); rem -= selected_tasksize; } diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index 70247e699..240384965 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -353,11 +353,8 @@ static struct sysrq_key_op sysrq_term_op = { static void moom_callback(struct work_struct *ignored) { - mutex_lock(&oom_lock); - if (!out_of_memory(node_zonelist(first_memory_node, GFP_KERNEL), - GFP_KERNEL, 0, NULL, true)) - pr_info("OOM request ignored because killer is disabled\n"); - mutex_unlock(&oom_lock); + out_of_memory(node_zonelist(first_memory_node, GFP_KERNEL), GFP_KERNEL, + 0, NULL, true); } static DECLARE_WORK(moom_work, moom_callback); |