diff options
Diffstat (limited to 'arch/ia64/kvm/Makefile')
-rw-r--r-- | arch/ia64/kvm/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile index 41b034ffa73b..52353397a1a4 100644 --- a/arch/ia64/kvm/Makefile +++ b/arch/ia64/kvm/Makefile | |||
@@ -42,10 +42,7 @@ $(obj)/$(offsets-file): arch/ia64/kvm/asm-offsets.s | |||
42 | # | 42 | # |
43 | 43 | ||
44 | EXTRA_CFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/ | 44 | EXTRA_CFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/ |
45 | 45 | EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/ | |
46 | $(addprefix $(objtree)/,$(obj)/memcpy.S $(obj)/memset.S): | ||
47 | $(shell ln -snf ../lib/memcpy.S $(src)/memcpy.S) | ||
48 | $(shell ln -snf ../lib/memset.S $(src)/memset.S) | ||
49 | 46 | ||
50 | common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o) | 47 | common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o) |
51 | 48 | ||
@@ -57,5 +54,5 @@ EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127 | |||
57 | kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \ | 54 | kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \ |
58 | vtlb.o process.o | 55 | vtlb.o process.o |
59 | #Add link memcpy and memset to avoid possible structure assignment error | 56 | #Add link memcpy and memset to avoid possible structure assignment error |
60 | kvm-intel-objs += memset.o memcpy.o | 57 | kvm-intel-objs += ../lib/memset.o ../lib/memcpy.o |
61 | obj-$(CONFIG_KVM_INTEL) += kvm-intel.o | 58 | obj-$(CONFIG_KVM_INTEL) += kvm-intel.o |