[PATCH] clocksource: replace is_continuous by a flag field

Using a flag filed allows to encode more than one information into a variable.
Preparatory patch for the generic clocksource verification.

[mingo@elte.hu: convert vmitime.c to the new clocksource flag]
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

3 files changed, 7 insertions, 4 deletions

diff --git a/arch/i386/kernel/hpet.c b/arch/i386/kernel/hpet.c
index 0b29d41322a2..7d2739fff3a3 100644
--- a/arch/i386/kernel/hpet.c
+++ b/arch/i386/kernel/hpet.c
@@ -26,7 +26,7 @@ static struct clocksource clocksource_hpet = {
         .mask           = HPET_MASK,
         .mult           = 0, /* set below */
         .shift          = HPET_SHIFT,
-        .is_continuous  = 1,
+        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
 static int __init init_hpet_clocksource(void)
diff --git a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c
index 0fd93107ff9a..a37654991788 100644
--- a/arch/i386/kernel/tsc.c
+++ b/arch/i386/kernel/tsc.c
@@ -314,7 +314,8 @@ static struct clocksource clocksource_tsc = {
         .mult                   = 0, /* to be set */
         .shift                  = 22,
         .update_callback        = tsc_update_callback,
-        .is_continuous          = 1,
+        .flags                  = CLOCK_SOURCE_IS_CONTINUOUS |
+                                  CLOCK_SOURCE_MUST_VERIFY,
 };
 
 static int tsc_update_callback(void)
@@ -434,8 +435,10 @@ static int __init init_tsc_clocksource(void)
                 clocksource_tsc.mult = clocksource_khz2mult(current_tsc_khz,
                                                         clocksource_tsc.shift);
                 /* lower the rating if we already know its unstable: */
-                if (check_tsc_unstable())
+                if (check_tsc_unstable()) {
                         clocksource_tsc.rating = 0;
+                        clocksource_tsc.flags &= ~CLOCK_SOURCE_IS_CONTINUOUS;
+                }
 
                 init_timer(&verify_tsc_freq_timer);
                 verify_tsc_freq_timer.function = verify_tsc_freq;
diff --git a/arch/i386/kernel/vmitime.c b/arch/i386/kernel/vmitime.c
index 2e2d8dbcbd68..76d2adcae5a3 100644
--- a/arch/i386/kernel/vmitime.c
+++ b/arch/i386/kernel/vmitime.c
@@ -115,7 +115,7 @@ static struct clocksource clocksource_vmi = {
         .mask                   = CLOCKSOURCE_MASK(64),
         .mult                   = 0, /* to be set */
         .shift                  = 22,
-        .is_continuous          = 1,
+        .flags                  = CLOCK_SOURCE_IS_CONTINUOUS,
 };