diff options
| author | jdl@freescale.com | 2005-09-07 22:59:48 +0200 |
|---|---|---|
| committer | Paul Mackerras | 2005-09-09 14:11:35 +0200 |
| commit | dd56fdf23dfa0127d512b73d4238dbd2b5a7c1eb (patch) | |
| tree | 59f952b87d4bec5f11c578a384c3aaa2ddf5860d /include/asm-ppc64/timex.h | |
| parent | [PATCH] powerpc: Make check_bugs() static inline (diff) | |
| download | kernel-qcow2-linux-dd56fdf23dfa0127d512b73d4238dbd2b5a7c1eb.tar.gz kernel-qcow2-linux-dd56fdf23dfa0127d512b73d4238dbd2b5a7c1eb.tar.xz kernel-qcow2-linux-dd56fdf23dfa0127d512b73d4238dbd2b5a7c1eb.zip | |
[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-ppc64/timex.h')
| -rw-r--r-- | include/asm-ppc64/timex.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/include/asm-ppc64/timex.h b/include/asm-ppc64/timex.h deleted file mode 100644 index 8db4da4064cd..000000000000 --- a/include/asm-ppc64/timex.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * linux/include/asm-ppc/timex.h - * - * PPC64 architecture timex specifications - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - */ -#ifndef _ASMPPC64_TIMEX_H -#define _ASMPPC64_TIMEX_H - -#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ - -typedef unsigned long cycles_t; - -static inline cycles_t get_cycles(void) -{ - cycles_t ret; - - __asm__ __volatile__("mftb %0" : "=r" (ret) : ); - return ret; -} - -#endif |