rcu: Switch to exedited grace periods for suspend as well as hibernation

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 this commit simply applies the
same logic by adding additional cases to the switch statement.

Note that this commit also switches from PM_POST_RESTORE to the
combination of PM_POST_HIBERNATION and PM_POST_SUSPEND.  A separate
patch from Borislav Petkov corrects the documentation to indicate that
this is necessary.

Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>

diff --git a/kernel/rcutree.c b/kernel/rcutree.c
index 63d27f16828609f95b2e89e3b27131df8772fdca..5b651e485360defbb2ea6a981b5af1433c32b541 100644 (file)
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@ -2978,10 +2978,12 @@ static int rcu_pm_notify(struct notifier_block *self,
 {
        switch (action) {
        case PM_HIBERNATION_PREPARE:
+       case PM_SUSPEND_PREPARE:
                if (nr_cpu_ids <= 256) /* Expediting bad for large systems. */
                        rcu_expedited = 1;
                break;
-       case PM_POST_RESTORE:
+       case PM_POST_HIBERNATION:
+       case PM_POST_SUSPEND:
                rcu_expedited = 0;
                break;
        default: