From 6e926effe5a03280cbfadde7c7e66d2ecf90fe97 Mon Sep 17 00:00:00 2001 From: Ram Gupta Date: Mon, 25 Sep 2006 23:31:54 -0700 Subject: [PATCH] --- yaml --- r: 35630 b: refs/heads/master c: 5a291b98b2116d669449885abef3000f747504b3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/oom_kill.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 71b9c28185c2..315ec493e0c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83e33a4711760469f5c3861b8ffea4947656d4eb +refs/heads/master: 5a291b98b2116d669449885abef3000f747504b3 diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c index c5e384000585..f1c0ef1fd21f 100644 --- a/trunk/mm/oom_kill.c +++ b/trunk/mm/oom_kill.c @@ -250,9 +250,9 @@ static struct task_struct *select_bad_process(unsigned long *ppoints) } /** - * We must be careful though to never send SIGKILL a process with - * CAP_SYS_RAW_IO set, send SIGTERM instead (but it's unlikely that - * we select a process with CAP_SYS_RAW_IO set). + * Send SIGKILL to the selected process irrespective of CAP_SYS_RAW_IO + * flag though it's unlikely that we select a process with CAP_SYS_RAW_IO + * set. */ static void __oom_kill_task(struct task_struct *p, const char *message) {