cfq: pass around cfq_io_cq instead of io_context

[linux-2.6-block.git] / kernel / time.c

diff --git a/kernel/time.c b/kernel/time.c
index 8e8dc6d705c93126c8b971e6eb88529b3924f678..73e416db0a1e6b23205cc416864ea2c91b9d26d0 100644 (file)
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -27,7 +27,7 @@
  *     with nanosecond accuracy
  */
 
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/timex.h>
 #include <linux/capability.h>
 #include <linux/clocksource.h>
@@ -575,7 +575,7 @@ EXPORT_SYMBOL(jiffies_to_timeval);
 /*
  * Convert jiffies/jiffies_64 to clock_t and back.
  */
-clock_t jiffies_to_clock_t(long x)
+clock_t jiffies_to_clock_t(unsigned long x)
 {
 #if (TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) == 0
 # if HZ < USER_HZ