diff --git a/[refs] b/[refs] index 881835bb8e12..2539647535ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba96a0c88098697a63e80157718b7440414ed24d +refs/heads/master: 49b12d4f5e274517b8bc032d507abf31cc2f4150 diff --git a/trunk/kernel/power/process.c b/trunk/kernel/power/process.c index eefca8581fa0..2cea2658e985 100644 --- a/trunk/kernel/power/process.c +++ b/trunk/kernel/power/process.c @@ -120,7 +120,7 @@ static unsigned int try_to_freeze_tasks(int freeze_user_space) cancel_freezing(p); continue; } - if (is_user_space(p) == !freeze_user_space) + if (freeze_user_space && !is_user_space(p)) continue; freeze_process(p); @@ -147,7 +147,7 @@ static unsigned int try_to_freeze_tasks(int freeze_user_space) TIMEOUT / HZ, todo); read_lock(&tasklist_lock); do_each_thread(g, p) { - if (is_user_space(p) == !freeze_user_space) + if (freeze_user_space && !is_user_space(p)) continue; task_lock(p);