git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into...
[pandora-kernel.git]
/
arch
/
x86
/
lguest
/
boot.c
diff --git
a/arch/x86/lguest/boot.c
b/arch/x86/lguest/boot.c
index
1cd6089
..
4e0068e
100644
(file)
--- a/
arch/x86/lguest/boot.c
+++ b/
arch/x86/lguest/boot.c
@@
-913,8
+913,6
@@
static struct clocksource lguest_clock = {
.rating = 200,
.read = lguest_clock_read,
.mask = CLOCKSOURCE_MASK(64),
.rating = 200,
.read = lguest_clock_read,
.mask = CLOCKSOURCE_MASK(64),
- .mult = 1 << 22,
- .shift = 22,
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
@@
-997,7
+995,7
@@
static void lguest_time_init(void)
/* Set up the timer interrupt (0) to go to our simple timer routine */
irq_set_handler(0, lguest_time_irq);
/* Set up the timer interrupt (0) to go to our simple timer routine */
irq_set_handler(0, lguest_time_irq);
- clocksource_register
(&lguest_clock
);
+ clocksource_register
_hz(&lguest_clock, NSEC_PER_SEC
);
/* We can't set cpumask in the initializer: damn C limitations! Set it
* here and register our timer device. */
/* We can't set cpumask in the initializer: damn C limitations! Set it
* here and register our timer device. */