aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-xtensa/div64.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-07 17:10:19 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-07 17:10:19 -0700
commitc8d8170feb824875baf68f8aaecb181a6500ce81 (patch)
treefc215c0776597015cd7e02ef12e24fe60e74961e /include/asm-xtensa/div64.h
parentMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
parentXtensa: use asm-generic/fcntl.h (diff)
downloadlinux-dev-c8d8170feb824875baf68f8aaecb181a6500ce81.tar.xz
linux-dev-c8d8170feb824875baf68f8aaecb181a6500ce81.zip
Merge git://git.linux-xtensa.org/kernel/xtensa-feed
* git://git.linux-xtensa.org/kernel/xtensa-feed: Xtensa: use asm-generic/fcntl.h [XTENSA] Remove non-rt signal handling [XTENSA] Move common sections into bss sections [XTENSA] clean-up header files [XTENSA] Use generic 64-bit division [XTENSA] Remove multi-exported symbols from xtensa_ksyms.c [XTENSA] fix sources using deprecated assembler directive [XTENSA] Spelling fixes in arch/xtensa [XTENSA] fix bit operations in bitops.h
Diffstat (limited to 'include/asm-xtensa/div64.h')
-rw-r--r--include/asm-xtensa/div64.h15
1 files changed, 3 insertions, 12 deletions
diff --git a/include/asm-xtensa/div64.h b/include/asm-xtensa/div64.h
index 20965e3af1dd..f35678cb0a9b 100644
--- a/include/asm-xtensa/div64.h
+++ b/include/asm-xtensa/div64.h
@@ -5,21 +5,12 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 2001 - 2005 Tensilica Inc.
+ * Copyright (C) 2001 - 2007 Tensilica Inc.
*/
#ifndef _XTENSA_DIV64_H
#define _XTENSA_DIV64_H
-#include <linux/types.h>
+#include <asm-generic/div64.h>
-#define do_div(n,base) ({ \
- int __res = n % ((unsigned int) base); \
- n /= (unsigned int) base; \
- __res; })
-
-static inline uint64_t div64_64(uint64_t dividend, uint64_t divisor)
-{
- return dividend / divisor;
-}
-#endif
+#endif /* _XTENSA_DIV64_H */