From: Heiko Carstens Exploit rcu_needs_cpu() interface to keep the cpu 'ticking' if necessary. Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton --- arch/s390/kernel/time.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff -puN arch/s390/kernel/time.c~s390-exploit-rcu_needs_cpu-interface arch/s390/kernel/time.c --- 25/arch/s390/kernel/time.c~s390-exploit-rcu_needs_cpu-interface Wed Apr 26 14:12:24 2006 +++ 25-akpm/arch/s390/kernel/time.c Wed Apr 26 14:12:24 2006 @@ -249,18 +249,19 @@ static inline void stop_hz_timer(void) unsigned long flags; unsigned long seq, next; __u64 timer, todval; + int cpu = smp_processor_id(); if (sysctl_hz_timer != 0) return; - cpu_set(smp_processor_id(), nohz_cpu_mask); + cpu_set(cpu, nohz_cpu_mask); /* * Leave the clock comparator set up for the next timer * tick if either rcu or a softirq is pending. */ - if (rcu_pending(smp_processor_id()) || local_softirq_pending()) { - cpu_clear(smp_processor_id(), nohz_cpu_mask); + if (rcu_needs_cpu(cpu) || local_softirq_pending()) { + cpu_clear(cpu, nohz_cpu_mask); return; } _