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

[mv-sheeva.git] / arch / s390 / include / asm / cputime.h

diff --git a/arch/s390/include/asm/cputime.h b/arch/s390/include/asm/cputime.h
index f23961ada7fb2ce8c99e3b240627d8e1016e1ba2..258ba88b7b5039edb8ed6b849774966d1e717bda 100644 (file)
--- a/arch/s390/include/asm/cputime.h
+++ b/arch/s390/include/asm/cputime.h
@@ -183,6 +183,7 @@ struct s390_idle_data {
        unsigned long long idle_count;
        unsigned long long idle_enter;
        unsigned long long idle_time;
+       int nohz_delay;
 };
 
 DECLARE_PER_CPU(struct s390_idle_data, s390_idle);
@@ -198,4 +199,11 @@ static inline void s390_idle_check(void)
                vtime_start_cpu();
 }
 
+static inline int s390_nohz_delay(int cpu)
+{
+       return per_cpu(s390_idle, cpu).nohz_delay != 0;
+}
+
+#define arch_needs_cpu(cpu) s390_nohz_delay(cpu)
+
 #endif /* _S390_CPUTIME_H */