diff options
| author |   Jeremy Fitzhardinge <jeremy@xensource.com> | 2007-07-17 18:37:04 -0700 |
|---|---|---|
| committer |   Jeremy Fitzhardinge <jeremy@goop.org> | 2007-07-18 08:47:42 -0700 |
| commit | 688340ea34c61ad12473ccd837325b59aada9a93 (patch) | |
| tree | 2862f4dca8d47fc4e6ecfaba2243d813344e3cd2 /include/asm-i386/paravirt.h | |
| parent | paravirt: helper to disable all IO space (diff) | |
| download | linux-dev-688340ea34c61ad12473ccd837325b59aada9a93.tar.xz linux-dev-688340ea34c61ad12473ccd837325b59aada9a93.zip | |
Add a sched_clock paravirt_op
The tsc-based get_scheduled_cycles interface is not a good match for
Xen's runstate accounting, which reports everything in nanoseconds.
This patch replaces this interface with a sched_clock interface, which
matches both Xen and VMI's requirements.
In order to do this, we:
1. replace get_scheduled_cycles with sched_clock
2. hoist cycles_2_ns into a common header
3. update vmi accordingly
One thing to note: because sched_clock is implemented as a weak
function in kernel/sched.c, we must define a real function in order to
override this weak binding. This means the usual paravirt_ops
technique of using an inline function won't work in this case.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Zachary Amsden <zach@vmware.com>
Cc: Dan Hecht <dhecht@vmware.com>
Cc: john stultz <johnstul@us.ibm.com>
Diffstat (limited to 'include/asm-i386/paravirt.h')
| -rw-r--r-- | include/asm-i386/paravirt.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/asm-i386/paravirt.h b/include/asm-i386/paravirt.h index 690ada22437a..7df88be2dd9e 100644 --- a/include/asm-i386/paravirt.h +++ b/include/asm-i386/paravirt.h @@ -118,7 +118,7 @@ struct paravirt_ops u64 (*read_tsc)(void); u64 (*read_pmc)(void); - u64 (*get_scheduled_cycles)(void); + unsigned long long (*sched_clock)(void); unsigned long (*get_cpu_khz)(void); /* Segment descriptor handling */ @@ -566,7 +566,10 @@ static inline u64 paravirt_read_tsc(void) #define rdtscll(val) (val = paravirt_read_tsc()) -#define get_scheduled_cycles(val) (val = paravirt_ops.get_scheduled_cycles()) +static inline unsigned long long paravirt_sched_clock(void) +{ + return PVOP_CALL0(unsigned long long, sched_clock); +} #define calculate_cpu_khz() (paravirt_ops.get_cpu_khz()) #define write_tsc(val1,val2) wrmsr(0x10, val1, val2) |