From 28d3cbe429034b4e080a63b5b86f7aaeff92a132 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 26 Jul 2011 20:14:36 +1000 Subject: [PATCH] kernel/time.c:578: error: conflicting types for 'jiffies_to_clock_t' include/linux/jiffies.h:306: note: previous declaration of 'jiffies_to_clock_t' was here Cc: John Stultz Cc: Thomas Gleixner Cc: hank Signed-off-by: Andrew Morton --- include/linux/jiffies.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h index f97672a36fa8..265e2c3cbd1c 100644 --- a/include/linux/jiffies.h +++ b/include/linux/jiffies.h @@ -303,7 +303,7 @@ extern void jiffies_to_timespec(const unsigned long jiffies, extern unsigned long timeval_to_jiffies(const struct timeval *value); extern void jiffies_to_timeval(const unsigned long jiffies, struct timeval *value); -extern clock_t jiffies_to_clock_t(long x); +extern clock_t jiffies_to_clock_t(unsigned long x); extern unsigned long clock_t_to_jiffies(unsigned long x); extern u64 jiffies_64_to_clock_t(u64 x); extern u64 nsec_to_clock_t(u64 x); -- 2.39.5