Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux.git] / kernel / time / jiffies.c

diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
index 555e21f7b966c789f48ee4aa5fece85cc7db6768..a4a0e478e44d16208d4333248995bbac610fc75b 100644 (file)
--- a/kernel/time/jiffies.c
+++ b/kernel/time/jiffies.c
@@ -59,9 +59,9 @@
 #define JIFFIES_SHIFT  8
 #endif
 
-static cycle_t jiffies_read(struct clocksource *cs)
+static u64 jiffies_read(struct clocksource *cs)
 {
-       return (cycle_t) jiffies;
+       return (u64) jiffies;
 }
 
 static struct clocksource clocksource_jiffies = {