From: Avi Kivity <[email protected]> Also update sync and Kbuild for missing files.
Signed-off-by: Avi Kivity <[email protected]> diff --git a/linux-2.6 b/linux-2.6 index 302471e..1406de8 160000 --- a/linux-2.6 +++ b/linux-2.6 @@ -1 +1 @@ -Subproject commit 302471ec2b5b6f74eba06973fb85e4584d20ef1e +Subproject commit 1406de8e11eb043681297adf86d6892ff8efc27a diff --git a/sync b/sync index 4a89296..0ea44a0 100755 --- a/sync +++ b/sync @@ -118,7 +118,7 @@ def hack(T, arch, file): hack_files = { 'x86': str.split('kvm_main.c mmu.c vmx.c svm.c x86.c irq.h lapic.c' - ' i8254.c kvm_trace.c timer.c'), + ' i8254.c kvm_trace.c'), 'ia64': str.split('kvm_main.c kvm_fw.c kvm_lib.c kvm-ia64.c'), } diff --git a/x86/Kbuild b/x86/Kbuild index e304c79..2457704 100644 --- a/x86/Kbuild +++ b/x86/Kbuild @@ -5,7 +5,6 @@ include $(obj)/../config.kbuild obj-m := kvm.o kvm-intel.o kvm-amd.o kvm-objs := kvm_main.o x86.o mmu.o x86_emulate.o ../anon_inodes.o irq.o i8259.o \ lapic.o ioapic.o preempt.o i8254.o coalesced_mmio.o irq_comm.o \ - timer.o eventfd.o \ ../external-module-compat.o ../request-irq-compat.o ifeq ($(EXT_CONFIG_KVM_TRACE),y) kvm-objs += kvm_trace.o -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
