Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea696f9c authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

ia64 kvm fixes for O=... builds 



* EXTRA_CFLAGS do not apply for *.S
* don't bother with symlinks to ../lib/mem*.S, just add ../lib/mem*.o
  to object list

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ff471b24

arch/ia64/kvm/Makefile

+2 −5
Original line number Diff line number Diff line
@@ -42,10 +42,7 @@ $(obj)/$(offsets-file): arch/ia64/kvm/asm-offsets.s 
#



EXTRA_CFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/



$(addprefix $(objtree)/,$(obj)/memcpy.S $(obj)/memset.S):

	$(shell ln -snf ../lib/memcpy.S $(src)/memcpy.S)

	$(shell ln -snf ../lib/memset.S $(src)/memset.S)

EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/



common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o)
@@ -57,5 +54,5 @@ EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127 
kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \

	vtlb.o process.o

#Add link memcpy and memset to avoid possible structure assignment error

kvm-intel-objs += memset.o memcpy.o

kvm-intel-objs += ../lib/memset.o ../lib/memcpy.o

obj-$(CONFIG_KVM_INTEL) += kvm-intel.o