diff options
| author | jdl@freescale.com <jdl@freescale.com> | 2005-09-08 00:59:48 +0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-09 16:11:35 +0400 |
| commit | dd56fdf23dfa0127d512b73d4238dbd2b5a7c1eb (patch) | |
| tree | 59f952b87d4bec5f11c578a384c3aaa2ddf5860d /include/asm-ppc/timex.h | |
| parent | 64807081e38703617cf9a5d71db14ea2b3e1cb04 (diff) | |
| download | linux-dd56fdf23dfa0127d512b73d4238dbd2b5a7c1eb.tar.xz | |
[PATCH] powerpc: Merge a few more include files
Merge a few asm-ppc and asm-ppc64 header files.
Note: the merge of setup.h intentionally does not carry
forward the m68k cruft. That means this patch continues
to break the already broken amiga on the ppc32.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc/timex.h')
| -rw-r--r-- | include/asm-ppc/timex.h | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/include/asm-ppc/timex.h b/include/asm-ppc/timex.h deleted file mode 100644 index cffc8712077c..000000000000 --- a/include/asm-ppc/timex.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * include/asm-ppc/timex.h - * - * ppc architecture timex specifications - */ -#ifdef __KERNEL__ -#ifndef _ASMppc_TIMEX_H -#define _ASMppc_TIMEX_H - -#include <linux/config.h> -#include <asm/cputable.h> - -#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ - -typedef unsigned long cycles_t; - -/* - * For the "cycle" counter we use the timebase lower half. - * Currently only used on SMP. - */ - -static inline cycles_t get_cycles(void) -{ - cycles_t ret = 0; - - __asm__ __volatile__( - "98: mftb %0\n" - "99:\n" - ".section __ftr_fixup,\"a\"\n" - " .long %1\n" - " .long 0\n" - " .long 98b\n" - " .long 99b\n" - ".previous" - : "=r" (ret) : "i" (CPU_FTR_601)); - return ret; -} - -#endif -#endif /* __KERNEL__ */ |