aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-01-09 23:52:21 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 11:01:35 -0500
commit67924be88607303a4459fe1c7dcd75527c338cf4 (patch)
treed95bdeb27c4a57bc866c6c7c865813f076ead3dc /kernel
parent5cca7619a562c9d98a3a0123dc878d79bf3c8fb3 (diff)
[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 @@
35#include <linux/interrupt.h> 35#include <linux/interrupt.h>
36#include <linux/slab.h> 36#include <linux/slab.h>
37#include <linux/time.h> 37#include <linux/time.h>
38#include <linux/calc64.h>
38 39
39#include <asm/uaccess.h> 40#include <asm/uaccess.h>
40#include <asm/semaphore.h> 41#include <asm/semaphore.h>
@@ -48,15 +49,6 @@
48#include <linux/workqueue.h> 49#include <linux/workqueue.h>
49#include <linux/module.h> 50#include <linux/module.h>
50 51
51#ifndef div_long_long_rem
52#include <asm/div64.h>
53
54#define div_long_long_rem(dividend,divisor,remainder) ({ \
55 u64 result = dividend; \
56 *remainder = do_div(result,divisor); \
57 result; })
58
59#endif
60#define CLOCK_REALTIME_RES TICK_NSEC /* In nano seconds. */ 52#define CLOCK_REALTIME_RES TICK_NSEC /* In nano seconds. */
61 53
62static inline u64 mpy_l_X_l_ll(unsigned long mpy1,unsigned long mpy2) 54static inline u64 mpy_l_X_l_ll(unsigned long mpy1,unsigned long mpy2)