diff --git a/[refs] b/[refs] index a59e89aa2656..5b455ff7fb1a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0008204ffe85d23382d6fd0f971f3f0fbe70bae2 +refs/heads/master: 711d2731d0cc90644a67b179bd78432c15a270f0 diff --git a/trunk/arch/s390/include/asm/cputime.h b/trunk/arch/s390/include/asm/cputime.h index 718374de9c7f..4e2bcafd2e3c 100644 --- a/trunk/arch/s390/include/asm/cputime.h +++ b/trunk/arch/s390/include/asm/cputime.h @@ -167,12 +167,12 @@ static inline clock_t cputime64_to_clock_t(cputime64_t cputime) } struct s390_idle_data { + int nohz_delay; unsigned int sequence; unsigned long long idle_count; unsigned long long idle_enter; unsigned long long idle_exit; unsigned long long idle_time; - int nohz_delay; }; DECLARE_PER_CPU(struct s390_idle_data, s390_idle);