>From cf169d21274911fea4b6a89a0a2c7b370d9de441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= Date: Sun, 12 May 2013 17:51:10 +0200 Subject: [PATCH] rcu: Really switch to expedited grace periods for suspend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 587ff2cf ("rcu: Expedite grace periods during suspend/resume") enabled expedited grace periods for hibernation, but not for suspend. The same issue applies to both cases, so apply the same logic. Restoring on post hibernation and post suspend, but not on post restore, which only applies to the restore error case. Cc: Borislav Petkov Signed-off-by: Bjørn Mork --- kernel/rcutree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/rcutree.c b/kernel/rcutree.c index 6934238..2dcbf84 100644 --- a/kernel/rcutree.c +++ b/kernel/rcutree.c @@ -3103,9 +3103,11 @@ static int rcu_pm_notify(struct notifier_block *self, { switch (action) { case PM_HIBERNATION_PREPARE: + case PM_SUSPEND_PREPARE: rcu_expedited = 1; break; - case PM_POST_RESTORE: + case PM_POST_HIBERNATION: + case PM_POST_SUSPEND: rcu_expedited = 0; break; default: -- 1.7.10.4