diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-12-05 22:13:49 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-12-05 22:13:49 +0100 |
| commit | 0518469d0a32be1e6dd8850ff274d52d72cdb52d (patch) | |
| tree | c13038d099e04208feae565947783cf92ceae9ee /arch/xtensa | |
| parent | 28a00184be261e3dc152ba0d664a067bbe235b6a (diff) | |
| parent | f5a54dd7952e9032785cd1ef0dde72cd61025341 (diff) | |
| download | linux-0518469d0a32be1e6dd8850ff274d52d72cdb52d.tar.gz linux-0518469d0a32be1e6dd8850ff274d52d72cdb52d.tar.bz2 linux-0518469d0a32be1e6dd8850ff274d52d72cdb52d.zip | |
Merge branch 'fortglx/3.3/tip/timers/core' of git://git.linaro.org/people/jstultz/linux into timers/core
Diffstat (limited to 'arch/xtensa')
| -rw-r--r-- | arch/xtensa/kernel/time.c | 13 |
1 files changed, 1 insertions, 12 deletions
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. */ |