diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2013-03-21 17:49:57 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2013-04-08 11:39:27 -0400 |
commit | 52c0065947b7f78a3d9808b421006a3d870d1f92 (patch) | |
tree | b23f080c849b89c39b6c2ac3045ddf6d70466315 /arch/s390/kernel/vtime.c | |
parent | 799fef06123f86ff69cf754f996219e6ad1678f8 (diff) |
s390: Use generic idle loop
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Paul McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Reviewed-by: Cc: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Link: http://lkml.kernel.org/r/20130321215235.090816526@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/s390/kernel/vtime.c')
-rw-r--r-- | arch/s390/kernel/vtime.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c index a0042acbd989..3fb09359eda6 100644 --- a/arch/s390/kernel/vtime.c +++ b/arch/s390/kernel/vtime.c | |||
@@ -158,8 +158,6 @@ void __kprobes vtime_stop_cpu(void) | |||
158 | unsigned long psw_mask; | 158 | unsigned long psw_mask; |
159 | 159 | ||
160 | trace_hardirqs_on(); | 160 | trace_hardirqs_on(); |
161 | /* Don't trace preempt off for idle. */ | ||
162 | stop_critical_timings(); | ||
163 | 161 | ||
164 | /* Wait for external, I/O or machine check interrupt. */ | 162 | /* Wait for external, I/O or machine check interrupt. */ |
165 | psw_mask = psw_kernel_bits | PSW_MASK_WAIT | PSW_MASK_DAT | | 163 | psw_mask = psw_kernel_bits | PSW_MASK_WAIT | PSW_MASK_DAT | |
@@ -169,9 +167,6 @@ void __kprobes vtime_stop_cpu(void) | |||
169 | /* Call the assembler magic in entry.S */ | 167 | /* Call the assembler magic in entry.S */ |
170 | psw_idle(idle, psw_mask); | 168 | psw_idle(idle, psw_mask); |
171 | 169 | ||
172 | /* Reenable preemption tracer. */ | ||
173 | start_critical_timings(); | ||
174 | |||
175 | /* Account time spent with enabled wait psw loaded as idle time. */ | 170 | /* Account time spent with enabled wait psw loaded as idle time. */ |
176 | idle->sequence++; | 171 | idle->sequence++; |
177 | smp_wmb(); | 172 | smp_wmb(); |