13 files changed, 18 insertions, 46 deletions

diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c
index bb978ede8985..6773fc83a670 100644
--- a/arch/cris/arch-v32/kernel/time.c
+++ b/arch/cris/arch-v32/kernel/time.c
@@ -47,14 +47,12 @@ static struct clocksource cont_rotime = {
         .rating = 300,
         .read   = read_cont_rotime,
         .mask   = CLOCKSOURCE_MASK(32),
-        .shift  = 10,
         .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
 static int __init etrax_init_cont_rotime(void)
 {
-        cont_rotime.mult = clocksource_khz2mult(100000, cont_rotime.shift);
-        clocksource_register(&cont_rotime);
+        clocksource_register_khz(&cont_rotime, 100000);
         return 0;
 }
 arch_initcall(etrax_init_cont_rotime);
diff --git a/arch/m68k/platform/68328/timers.c b/arch/m68k/platform/68328/timers.c
index 309f725995bf..f2678866067b 100644
--- a/arch/m68k/platform/68328/timers.c
+++ b/arch/m68k/platform/68328/timers.c
@@ -93,7 +93,6 @@ static struct clocksource m68328_clk = {
         .name   = "timer",
         .rating = 250,
         .read   = m68328_read_clk,
-        .shift  = 20,
         .mask   = CLOCKSOURCE_MASK(32),
         .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
 };
@@ -115,8 +114,7 @@ void hw_timer_init(void)
 
         /* Enable timer 1 */
         TCTL |= TCTL_TEN;
-        m68328_clk.mult = clocksource_hz2mult(TICKS_PER_JIFFY*HZ, m68328_clk.shift);
-        clocksource_register(&m68328_clk);
+        clocksource_register_hz(&m68328_clk, TICKS_PER_JIFFY*HZ);
 }
 
 /***************************************************************************/
diff --git a/arch/m68k/platform/coldfire/dma_timer.c b/arch/m68k/platform/coldfire/dma_timer.c
index a5f562823d7a..235ad57c4707 100644
--- a/arch/m68k/platform/coldfire/dma_timer.c
+++ b/arch/m68k/platform/coldfire/dma_timer.c
@@ -44,7 +44,6 @@ static struct clocksource clocksource_cf_dt = {
         .rating         = 200,
         .read           = cf_dt_get_cycles,
         .mask           = CLOCKSOURCE_MASK(32),
-        .shift          = 20,
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -60,9 +59,7 @@ static int __init  init_cf_dt_clocksource(void)
         __raw_writeb(0x00, DTER0);
         __raw_writel(0x00000000, DTRR0);
         __raw_writew(DMA_DTMR_CLK_DIV_16 | DMA_DTMR_ENABLE, DTMR0);
-        clocksource_cf_dt.mult = clocksource_hz2mult(DMA_FREQ,
-                                                     clocksource_cf_dt.shift);
-        return clocksource_register(&clocksource_cf_dt);
+        return clocksource_register_hz(&clocksource_cf_dt, DMA_FREQ);
 }
 
 arch_initcall(init_cf_dt_clocksource);
diff --git a/arch/m68k/platform/coldfire/pit.c b/arch/m68k/platform/coldfire/pit.c
index c2b980926bec..02663d25822d 100644
--- a/arch/m68k/platform/coldfire/pit.c
+++ b/arch/m68k/platform/coldfire/pit.c
@@ -144,7 +144,6 @@ static struct clocksource pit_clk = {
         .name   = "pit",
         .rating = 100,
         .read   = pit_read_clk,
-        .shift  = 20,
         .mask   = CLOCKSOURCE_MASK(32),
 };
 
@@ -162,8 +161,7 @@ void hw_timer_init(void)
 
         setup_irq(MCFINT_VECBASE + MCFINT_PIT1, &pit_irq);
 
-        pit_clk.mult = clocksource_hz2mult(FREQ, pit_clk.shift);
-        clocksource_register(&pit_clk);
+        clocksource_register_hz(&pit_clk, FREQ);
 }
 
 /***************************************************************************/
diff --git a/arch/m68k/platform/coldfire/sltimers.c b/arch/m68k/platform/coldfire/sltimers.c
index 6a85daf9a7fd..b7f822b552bb 100644
--- a/arch/m68k/platform/coldfire/sltimers.c
+++ b/arch/m68k/platform/coldfire/sltimers.c
@@ -114,7 +114,6 @@ static struct clocksource mcfslt_clk = {
         .name   = "slt",
         .rating = 250,
         .read   = mcfslt_read_clk,
-        .shift  = 20,
         .mask   = CLOCKSOURCE_MASK(32),
         .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
 };
@@ -136,8 +135,7 @@ void hw_timer_init(void)
 
         setup_irq(MCF_IRQ_TIMER, &mcfslt_timer_irq);
 
-        mcfslt_clk.mult = clocksource_hz2mult(MCF_BUSCLK, mcfslt_clk.shift);
-        clocksource_register(&mcfslt_clk);
+        clocksource_register_hz(&mcfslt_clk, MCF_BUSCLK);
 
 #ifdef CONFIG_HIGHPROFILE
         mcfslt_profile_init();
diff --git a/arch/m68k/platform/coldfire/timers.c b/arch/m68k/platform/coldfire/timers.c
index 60242f65fea9..0d90da32fcdb 100644
--- a/arch/m68k/platform/coldfire/timers.c
+++ b/arch/m68k/platform/coldfire/timers.c
@@ -88,7 +88,6 @@ static struct clocksource mcftmr_clk = {
         .name   = "tmr",
         .rating = 250,
         .read   = mcftmr_read_clk,
-        .shift  = 20,
         .mask   = CLOCKSOURCE_MASK(32),
         .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
 };
@@ -109,8 +108,7 @@ void hw_timer_init(void)
         __raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 |
                 MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, TA(MCFTIMER_TMR));
 
-        mcftmr_clk.mult = clocksource_hz2mult(FREQ, mcftmr_clk.shift);
-        clocksource_register(&mcftmr_clk);
+        clocksource_register_hz(&mcftmr_clk, FREQ);
 
         setup_irq(MCF_IRQ_TIMER, &mcftmr_timer_irq);
 
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 45b7389d77aa..7c0774397b89 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -198,8 +198,6 @@ static struct clocksource clocksource_cr16 = {
         .rating                 = 300,
         .read                   = read_cr16,
         .mask                   = CLOCKSOURCE_MASK(BITS_PER_LONG),
-        .mult                   = 0, /* to be set */
-        .shift                  = 22,
         .flags                  = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -270,7 +268,5 @@ void __init time_init(void)
 
         /* register at clocksource framework */
         current_cr16_khz = PAGE0->mem_10msec/10;  /* kHz */
-        clocksource_cr16.mult = clocksource_khz2mult(current_cr16_khz,
-                                                clocksource_cr16.shift);
-        clocksource_register(&clocksource_cr16);
+        clocksource_register_khz(&clocksource_cr16, current_cr16_khz);
 }
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index a08d9fab81f2..82a6e22f1f35 100644
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -75,8 +75,6 @@ static struct clocksource itimer_clocksource = {
         .rating         = 300,
         .read           = itimer_read,
         .mask           = CLOCKSOURCE_MASK(64),
-        .mult           = 1000,
-        .shift          = 0,
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -94,9 +92,9 @@ static void __init setup_itimer(void)
                 clockevent_delta2ns(60 * HZ, &itimer_clockevent);
         itimer_clockevent.min_delta_ns =
                 clockevent_delta2ns(1, &itimer_clockevent);
-        err = clocksource_register(&itimer_clocksource);
+        err = clocksource_register_hz(&itimer_clocksource, USEC_PER_SEC);
         if (err) {
-                printk(KERN_ERR "clocksource_register returned %d\n", err);
+                printk(KERN_ERR "clocksource_register_hz returned %d\n", err);
                 return;
         }
         clockevents_register_device(&itimer_clockevent);
diff --git a/arch/x86/include/asm/mach_timer.h b/arch/x86/include/asm/mach_timer.h
index 853728519ae9..88d0c3c74c13 100644
--- a/arch/x86/include/asm/mach_timer.h
+++ b/arch/x86/include/asm/mach_timer.h
@@ -15,7 +15,7 @@
 
 #define CALIBRATE_TIME_MSEC 30 /* 30 msecs */
 #define CALIBRATE_LATCH \
-        ((CLOCK_TICK_RATE * CALIBRATE_TIME_MSEC + 1000/2)/1000)
+        ((PIT_TICK_RATE * CALIBRATE_TIME_MSEC + 1000/2)/1000)
 
 static inline void mach_prepare_counter(void)
 {
diff --git a/arch/x86/include/asm/tsc.h b/arch/x86/include/asm/tsc.h
index 83e2efd181e2..15d99153a96d 100644
--- a/arch/x86/include/asm/tsc.h
+++ b/arch/x86/include/asm/tsc.h
@@ -51,6 +51,8 @@ extern int unsynchronized_tsc(void);
 extern int check_tsc_unstable(void);
 extern unsigned long native_calibrate_tsc(void);
 
+extern int tsc_clocksource_reliable;
+
 /*
  * Boot-time check whether the TSCs are synchronized across
  * all CPUs/cores:
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index db483369f10b..2c9cf0fd78f5 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -35,7 +35,7 @@ static int __read_mostly tsc_unstable;
    erroneous rdtsc usage on !cpu_has_tsc processors */
 static int __read_mostly tsc_disabled = -1;
 
-static int tsc_clocksource_reliable;
+int tsc_clocksource_reliable;
 /*
  * Scheduler clock - returns current time in nanosec units.
  */
@@ -178,11 +178,11 @@ static unsigned long calc_pmtimer_ref(u64 deltatsc, u64 pm1, u64 pm2)
 }
 
 #define CAL_MS          10
-#define CAL_LATCH       (CLOCK_TICK_RATE / (1000 / CAL_MS))
+#define CAL_LATCH       (PIT_TICK_RATE / (1000 / CAL_MS))
 #define CAL_PIT_LOOPS   1000
 
 #define CAL2_MS         50
-#define CAL2_LATCH      (CLOCK_TICK_RATE / (1000 / CAL2_MS))
+#define CAL2_LATCH      (PIT_TICK_RATE / (1000 / CAL2_MS))
 #define CAL2_PIT_LOOPS  5000
 
 
diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c
index 0aa5fed8b9e6..9eba29b46cb7 100644
--- a/arch/x86/kernel/tsc_sync.c
+++ b/arch/x86/kernel/tsc_sync.c
@@ -113,7 +113,7 @@ void __cpuinit check_tsc_sync_source(int cpu)
         if (unsynchronized_tsc())
                 return;
 
-        if (boot_cpu_has(X86_FEATURE_TSC_RELIABLE)) {
+        if (tsc_clocksource_reliable) {
                 if (cpu == (nr_cpu_ids-1) || system_state != SYSTEM_BOOTING)
                         pr_info(
                         "Skipped synchronization checks as TSC is reliable.\n");
@@ -172,7 +172,7 @@ void __cpuinit check_tsc_sync_target(void)
 {
         int cpus = 2;
 
-        if (unsynchronized_tsc() || boot_cpu_has(X86_FEATURE_TSC_RELIABLE))
+        if (unsynchronized_tsc() || tsc_clocksource_reliable)
                 return;
 
         /*
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index f3e5eb43f71c..ac62f9cf1e10 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -41,14 +41,6 @@ static struct clocksource ccount_clocksource = {
         .rating = 200,
         .read = ccount_read,
         .mask = CLOCKSOURCE_MASK(32),
-        /*
-         * With a shift of 22 the lower limit of the cpu clock is
-         * 1MHz, where NSEC_PER_CCOUNT is 1000 or a bit less than
-         * 2^10: Since we have 32 bits and the multiplicator can
-         * already take up as much as 10 bits, this leaves us with
-         * remaining upper 22 bits.
-         */
-        .shift = 22,
 };
 
 static irqreturn_t timer_interrupt(int irq, void *dev_id);
@@ -66,10 +58,7 @@ void __init time_init(void)
         printk("%d.%02d MHz\n", (int)ccount_per_jiffy/(1000000/HZ),
                         (int)(ccount_per_jiffy/(10000/HZ))%100);
 #endif
-        ccount_clocksource.mult =
-                clocksource_hz2mult(CCOUNT_PER_JIFFY * HZ,
-                                ccount_clocksource.shift);
-        clocksource_register(&ccount_clocksource);
+        clocksource_register_hz(&ccount_clocksource, CCOUNT_PER_JIFFY * HZ);
 
         /* Initialize the linux timer interrupt. */