projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
kernel
/
vmiclock_32.c
diff --git
a/arch/x86/kernel/vmiclock_32.c
b/arch/x86/kernel/vmiclock_32.c
index 2b3eb82efeeb4e1a13dfe8780e586960800fcdbb..611b9e2360d3d356bc379127eb8185a08c55c97e 100644
(file)
--- a/
arch/x86/kernel/vmiclock_32.c
+++ b/
arch/x86/kernel/vmiclock_32.c
@@
-68,7
+68,7
@@
unsigned long long vmi_sched_clock(void)
return cycles_2_ns(vmi_timer_ops.get_cycle_counter(VMI_CYCLES_AVAILABLE));
}
-/*
paravirt_ops.get_tsc_khz
= vmi_tsc_khz */
+/*
x86_platform.calibrate_tsc
= vmi_tsc_khz */
unsigned long vmi_tsc_khz(void)
{
unsigned long long khz;