Merge branch 'linux-2.6'

1 files changed, 2 insertions, 0 deletions

diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
index 3554b76da84c..2c2dd8410dc4 100644
--- a/kernel/rcupdate.c
+++ b/kernel/rcupdate.c
@@ -558,9 +558,11 @@ static int __cpuinit rcu_cpu_notify(struct notifier_block *self,
         long cpu = (long)hcpu;
         switch (action) {
         case CPU_UP_PREPARE:
+        case CPU_UP_PREPARE_FROZEN:
                 rcu_online_cpu(cpu);
                 break;
         case CPU_DEAD:
+        case CPU_DEAD_FROZEN:
                 rcu_offline_cpu(cpu);
                 break;
         default: