From 47098bf2161dfd5439ba955be817ede40f594d66 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Mon, 15 May 2006 09:43:59 -0700 Subject: [PATCH] --- yaml --- r: 26702 b: refs/heads/master c: 5afdbd6e84c7fbdaa7cfde4cbee0d3a5f4f56da2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/time.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cbf7feda4479..156b94d56c72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 986733e01d258c26107f1da9d8d47c718349ad2f +refs/heads/master: 5afdbd6e84c7fbdaa7cfde4cbee0d3a5f4f56da2 diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c index fea043b69b91..029f09901b85 100644 --- a/trunk/arch/s390/kernel/time.c +++ b/trunk/arch/s390/kernel/time.c @@ -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; }