diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-16 11:22:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-16 11:22:27 +0100 |
| commit | 006b20fe4c69189b0d854e5eabf269e50ca86cdd (patch) | |
| tree | 948b08825a36114c85ddc2bfcd965c261e32810f /arch/x86/kernel/pvclock.c | |
| parent | 5f29805a4f4627e766f862ff9f10c14f5f314359 (diff) | |
| parent | d949750fed168b6553ca11ed19e4affd19d7a4d7 (diff) | |
| download | op-kernel-dev-006b20fe4c69189b0d854e5eabf269e50ca86cdd.zip op-kernel-dev-006b20fe4c69189b0d854e5eabf269e50ca86cdd.tar.gz | |
Merge branch 'perf/urgent' into perf/core
Merge reason: We want to apply a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/pvclock.c')
| -rw-r--r-- | arch/x86/kernel/pvclock.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c index 008b91e..42eb330 100644 --- a/arch/x86/kernel/pvclock.c +++ b/arch/x86/kernel/pvclock.c @@ -83,6 +83,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src) static atomic64_t last_value = ATOMIC64_INIT(0); +void pvclock_resume(void) +{ + atomic64_set(&last_value, 0); +} + cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src) { struct pvclock_shadow_time shadow; |
