diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 11:49:08 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 11:49:08 -0400 |
commit | c7e745c6de92a757ec525fbc9a74891651a5f1c6 (patch) | |
tree | c91b5dbb44adea2b2353e1fc0195582328561151 /include/asm-x86/pvclock.h | |
parent | 688c91755dc3d3c03d8c67c1df13c02be258768e (diff) | |
parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) |
Merge commit 'v2.6.26-rc8' into core/softlockup
Diffstat (limited to 'include/asm-x86/pvclock.h')
-rw-r--r-- | include/asm-x86/pvclock.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/asm-x86/pvclock.h b/include/asm-x86/pvclock.h new file mode 100644 index 000000000000..85b1bba8e0a3 --- /dev/null +++ b/include/asm-x86/pvclock.h | |||
@@ -0,0 +1,13 @@ | |||
1 | #ifndef _ASM_X86_PVCLOCK_H_ | ||
2 | #define _ASM_X86_PVCLOCK_H_ | ||
3 | |||
4 | #include <linux/clocksource.h> | ||
5 | #include <asm/pvclock-abi.h> | ||
6 | |||
7 | /* some helper functions for xen and kvm pv clock sources */ | ||
8 | cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src); | ||
9 | void pvclock_read_wallclock(struct pvclock_wall_clock *wall, | ||
10 | struct pvclock_vcpu_time_info *vcpu, | ||
11 | struct timespec *ts); | ||
12 | |||
13 | #endif /* _ASM_X86_PVCLOCK_H_ */ | ||