summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2008-04-28 06:59:05 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 10:03:30 -0700
commitea696f9cf37d8ab9236dd133ddb2727264f3add6 (patch)
tree7520424f9059eaa9ab291eb74be52df5d1fa957c /arch
parentff471b2464ca7344eba347d360f23ea415a774dc (diff)
downloadlinux-3.10-ea696f9cf37d8ab9236dd133ddb2727264f3add6.tar.gz
linux-3.10-ea696f9cf37d8ab9236dd133ddb2727264f3add6.tar.bz2
linux-3.10-ea696f9cf37d8ab9236dd133ddb2727264f3add6.zip
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: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/kvm/Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile
index 41b034ffa73..52353397a1a 100644
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -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