From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 10 Jan 2006 04:52:21 +0000 (-0800)
Subject: [PATCH] hrtimer: remove duplicate div_long_long_rem implementation
X-Git-Tag: v2.6.16-rc1~601
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67924be88607303a4459fe1c7dcd75527c338cf4;p=linux-2.6

[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>
---

diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index 5870efb3e2..fdb7107774 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)