From 7c379901ba7c94d1e870e238ee9335af8b435922 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sun, 13 Nov 2011 23:19:48 +0000 Subject: [PATCH] --- yaml --- r: 288795 b: refs/heads/master c: 058892e632aa53be8255c2f0a42f9ace7bed66bb h: refs/heads/master i: 288793: 6ee4abb07293fcdf279fc6ec485984d432a2fb4c 288791: ac4e68bdc69392f8d72d4b17f32159f834887627 v: v3 --- [refs] | 2 +- trunk/kernel/time/timekeeping.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 66bdc4ff311c..da294a20ba73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92c1d3ed4dc0b8cfb10e85ed0c9934db41efc027 +refs/heads/master: 058892e632aa53be8255c2f0a42f9ace7bed66bb diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c index 74bb5701e0b3..06f40ae13b7b 100644 --- a/trunk/kernel/time/timekeeping.c +++ b/trunk/kernel/time/timekeeping.c @@ -25,6 +25,8 @@ struct timekeeper { /* Current clocksource used for timekeeping. */ struct clocksource *clock; + /* NTP adjusted clock multiplier */ + u32 mult; /* The shift value of the current clocksource. */ int shift; @@ -45,8 +47,6 @@ struct timekeeper { /* Shift conversion between clock shifted nano seconds and * ntp shifted nano seconds. */ int ntp_error_shift; - /* NTP adjusted clock multiplier */ - u32 mult; /* The current time */ struct timespec xtime;