Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[firefly-linux-kernel-4.4.55.git] / arch / s390 / kernel / process.c

diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index 7618085b416431379adafe2c1f7e65ea74c0b133..3732e4c09cbe5c68e1a8fb1894a3b897fae9f0f7 100644 (file)
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -77,13 +77,8 @@ static void default_idle(void)
                local_irq_enable();
                return;
        }
-       trace_hardirqs_on();
-       /* Don't trace preempt off for idle. */
-       stop_critical_timings();
-       /* Stop virtual timer and halt the cpu. */
+       /* Halt the cpu and keep track of cpu time accounting. */
        vtime_stop_cpu();
-       /* Reenable preemption tracer. */
-       start_critical_timings();
 }
 
 void cpu_idle(void)