Merge remote-tracking branch 'tip/auto-latest'

[karo-tx-linux.git] / arch / s390 / kernel / vtime.c

diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 449ac22cc71bd401485c95465ad55f67d944a853..cfb21fdca71c70117921175c1302b83fe8cc682a 100644 (file)
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -378,9 +378,8 @@ static int __cpuinit s390_nohz_notify(struct notifier_block *self,
        long cpu = (long) hcpu;
 
        idle = &per_cpu(s390_idle, cpu);
-       switch (action) {
+       switch (action & ~CPU_TASKS_FROZEN) {
        case CPU_DYING:
-       case CPU_DYING_FROZEN:
                idle->nohz_delay = 0;
        default:
                break;