Merge git://git.infradead.org/iommu-2.6

[deliverable/linux.git] / arch / s390 / include / asm / cputime.h

diff --git a/arch/s390/include/asm/cputime.h b/arch/s390/include/asm/cputime.h
index ec917d42ee6d2b18264e26fe6407d2ced5da17ed..7a3817a656df721a9e85f2104c7c0e374358b3ee 100644 (file)
--- a/arch/s390/include/asm/cputime.h
+++ b/arch/s390/include/asm/cputime.h
@@ -178,7 +178,7 @@ cputime64_to_clock_t(cputime64_t cputime)
 }
 
 struct s390_idle_data {
-       spinlock_t lock;
+       unsigned int sequence;
        unsigned long long idle_count;
        unsigned long long idle_enter;
        unsigned long long idle_time;