diff options
| author | john stultz <johnstul@us.ibm.com> | 2007-02-16 10:28:19 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 17:14:00 +0100 |
| commit | c37e7bb5d2ce36ef377caabfced0b132bb1bf6a7 (patch) | |
| tree | 3cc175f6922e7921bad5e588dd3046db1a67f996 /include/asm-x86_64 | |
| parent | [PATCH] time: x86_64: hpet_address cleanup (diff) | |
| download | linux-c37e7bb5d2ce36ef377caabfced0b132bb1bf6a7.tar.xz linux-c37e7bb5d2ce36ef377caabfced0b132bb1bf6a7.zip | |
[PATCH] time: x86_64: split x86_64/kernel/time.c up
In preparation for the x86_64 generic time conversion, this patch splits out
TSC and HPET related code from arch/x86_64/kernel/time.c into respective
hpet.c and tsc.c files.
[akpm@osdl.org: fix printk timestamps]
[akpm@osdl.org: cleanup]
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@muc.de>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-x86_64')
| -rw-r--r-- | include/asm-x86_64/hpet.h | 6 | ||||
| -rw-r--r-- | include/asm-x86_64/timex.h | 11 |
2 files changed, 17 insertions, 0 deletions
diff --git a/include/asm-x86_64/hpet.h b/include/asm-x86_64/hpet.h index 60d51274fcf9..59a66f084611 100644 --- a/include/asm-x86_64/hpet.h +++ b/include/asm-x86_64/hpet.h @@ -56,9 +56,15 @@ extern int is_hpet_enabled(void); extern int hpet_rtc_timer_init(void); extern int apic_is_clustered_box(void); +extern int hpet_arch_init(void); +extern int hpet_timer_stop_set_go(unsigned long tick); +extern int hpet_reenable(void); +extern unsigned int hpet_calibrate_tsc(void); extern int hpet_use_timer; extern unsigned long hpet_address; +extern unsigned long hpet_period; +extern unsigned long hpet_tick; #ifdef CONFIG_HPET_EMULATE_RTC extern int hpet_mask_rtc_irq_bit(unsigned long bit_mask); diff --git a/include/asm-x86_64/timex.h b/include/asm-x86_64/timex.h index a4493a77d641..a0174757aee2 100644 --- a/include/asm-x86_64/timex.h +++ b/include/asm-x86_64/timex.h @@ -20,6 +20,17 @@ extern int read_current_timer(unsigned long *timer_value); #define ARCH_HAS_READ_CURRENT_TIMER 1 +#define USEC_PER_TICK (USEC_PER_SEC / HZ) +#define NSEC_PER_TICK (NSEC_PER_SEC / HZ) +#define FSEC_PER_TICK (FSEC_PER_SEC / HZ) + +#define NS_SCALE 10 /* 2^10, carefully chosen */ +#define US_SCALE 32 /* 2^32, arbitralrily chosen */ + extern struct vxtime_data vxtime; +extern unsigned int do_gettimeoffset_hpet(void); +extern unsigned int do_gettimeoffset_tsc(void); +extern void set_cyc2ns_scale(unsigned long khz); +extern int notsc; #endif |