Merge branch 'linus' into test

[karo-tx-linux.git] / kernel / time / jiffies.c

diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
index a99b2a6e6a07354781da79b6067b1944d438d5f9..1ca99557e929261da5825325dafba49edde8be12 100644 (file)
--- a/kernel/time/jiffies.c
+++ b/kernel/time/jiffies.c
@@ -61,8 +61,8 @@ struct clocksource clocksource_jiffies = {
        .read           = jiffies_read,
        .mask           = 0xffffffff, /*32bits*/
        .mult           = NSEC_PER_JIFFY << JIFFIES_SHIFT, /* details above */
+       .mult_orig      = NSEC_PER_JIFFY << JIFFIES_SHIFT,
        .shift          = JIFFIES_SHIFT,
-       .is_continuous  = 0, /* tick based, not free running */
 };
 
 static int __init init_jiffies_clocksource(void)
@@ -70,4 +70,4 @@ static int __init init_jiffies_clocksource(void)
        return clocksource_register(&clocksource_jiffies);
 }
 
-module_init(init_jiffies_clocksource);
+core_initcall(init_jiffies_clocksource);