summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-01-09 20:52:21 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 08:01:35 -0800
commit67924be88607303a4459fe1c7dcd75527c338cf4 (patch)
treed95bdeb27c4a57bc866c6c7c865813f076ead3dc /kernel
parent5cca7619a562c9d98a3a0123dc878d79bf3c8fb3 (diff)
downloadlinux-67924be88607303a4459fe1c7dcd75527c338cf4.tar.bz2
[PATCH] hrtimer: remove duplicate div_long_long_rem implementation
make posix-timers.c use the generic calc64.h facility Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/posix-timers.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index 5870efb3e200..fdb710777439 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -35,6 +35,7 @@
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/time.h>
+#include <linux/calc64.h>
#include <asm/uaccess.h>
#include <asm/semaphore.h>
@@ -48,15 +49,6 @@
#include <linux/workqueue.h>
#include <linux/module.h>
-#ifndef div_long_long_rem
-#include <asm/div64.h>
-
-#define div_long_long_rem(dividend,divisor,remainder) ({ \
- u64 result = dividend; \
- *remainder = do_div(result,divisor); \
- result; })
-
-#endif
#define CLOCK_REALTIME_RES TICK_NSEC /* In nano seconds. */
static inline u64 mpy_l_X_l_ll(unsigned long mpy1,unsigned long mpy2)