diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef (patch) | |
tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 /arch/sparc/include/asm/timex_64.h | |
parent | e56b3bc7942982ac2589c942fb345e38bc7a341a (diff) | |
parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sparc/include/asm/timex_64.h')
-rw-r--r-- | arch/sparc/include/asm/timex_64.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/timex_64.h b/arch/sparc/include/asm/timex_64.h new file mode 100644 index 00000000000..18b30bc9823 --- /dev/null +++ b/arch/sparc/include/asm/timex_64.h | |||
@@ -0,0 +1,19 @@ | |||
1 | /* | ||
2 | * linux/include/asm/timex.h | ||
3 | * | ||
4 | * sparc64 architecture timex specifications | ||
5 | */ | ||
6 | #ifndef _ASMsparc64_TIMEX_H | ||
7 | #define _ASMsparc64_TIMEX_H | ||
8 | |||
9 | #include <asm/timer.h> | ||
10 | |||
11 | #define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ | ||
12 | |||
13 | /* Getting on the cycle counter on sparc64. */ | ||
14 | typedef unsigned long cycles_t; | ||
15 | #define get_cycles() tick_ops->get_tick() | ||
16 | |||
17 | #define ARCH_HAS_READ_CURRENT_TIMER | ||
18 | |||
19 | #endif | ||