diff options
| author | Avi Kivity <avi@redhat.com> | 2012-07-26 18:01:50 +0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-08-01 00:21:06 -0300 |
| commit | e9d90d472da97e1b1560bffb89578ba082c88a69 (patch) | |
| tree | a44f4b5d0d74f88b6dc886a6ee024ae7dd25a5c5 /arch/x86/kvm/Makefile | |
| parent | 4a4541a40e1fe145c72c4b959fac524a5600d9fb (diff) | |
| download | op-kernel-dev-e9d90d472da97e1b1560bffb89578ba082c88a69.zip op-kernel-dev-e9d90d472da97e1b1560bffb89578ba082c88a69.tar.gz | |
KVM: Remove internal timer abstraction
kvm_timer_fn(), the sole inhabitant of timer.c, is only used by lapic.c. Move
it there to make it easier to hack on it.
struct kvm_timer is a thin wrapper around hrtimer, and only adds obfuscation.
Move near its two users (with different names) to prepare for simplification.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kvm/Makefile')
| -rw-r--r-- | arch/x86/kvm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile index 4f579e8..04d3040 100644 --- a/arch/x86/kvm/Makefile +++ b/arch/x86/kvm/Makefile @@ -12,7 +12,7 @@ kvm-$(CONFIG_IOMMU_API) += $(addprefix ../../../virt/kvm/, iommu.o) kvm-$(CONFIG_KVM_ASYNC_PF) += $(addprefix ../../../virt/kvm/, async_pf.o) kvm-y += x86.o mmu.o emulate.o i8259.o irq.o lapic.o \ - i8254.o timer.o cpuid.o pmu.o + i8254.o cpuid.o pmu.o kvm-intel-y += vmx.o kvm-amd-y += svm.o |
