Hi, Avi
Could you revert the commit d6f9e28239fd6ac6ace6e72b44c257ed3936fdd5 ? It should be an incorrect fix, and leads to fail to generate asm-offsets.h under some special configrations. It should be my fault, sorry! Please apply this one. Thanks!
Xiantao
>From c680d223767159f8894e2568148c1cfe3ac5cf3c Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@xxxxxxxxx>
Date: Thu, 23 Oct 2008 10:37:06 +0800
Subject: [PATCH] KVM: ia64: Makefile fix for forcing to re-generate asm-offsets.h
To avoid using stale asm-offsets.h.
Signed-off-by: Xiantao Zhang <xiantao.zhang@xxxxxxxxx>
---
arch/ia64/kvm/Makefile | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile
index cf37f8f..3ab4d6d 100644
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -29,13 +29,18 @@ define cmd_offsets
echo ""; \
echo "#endif" ) > $@
endef
+
# We use internal rules to avoid the "is up to date" message from make
-arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c
+arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c \
+ $(wildcard $(srctree)/arch/ia64/include/asm/*.h)\
+ $(wildcard $(srctree)/include/linux/*.h)
$(call if_changed_dep,cc_s_c)
$(obj)/$(offsets-file): arch/ia64/kvm/asm-offsets.s
$(call cmd,offsets)
+FORCE : $(obj)/$(offsets-file)
+
#
# Makefile for Kernel-based Virtual Machine module
#
@@ -53,7 +58,6 @@ endif
kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o
obj-$(CONFIG_KVM) += kvm.o
-FORCE : $(obj)/$(offsets-file)
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
--
1.5.1
-----Original Message-----
From: Avi Kivity [mailto:avi@xxxxxxxxxx]
Sent: Thursday, October 16, 2008 4:29 PM
To: Zhang, Xiantao
Cc: kvm-ia64@xxxxxxxxxxxxxxx; kvm
Subject: Re: [PATCH] kvm/ia64: Makefile fix for forcing to re-generate asm-offsets.h
Zhang, Xiantao wrote:
> Hi, Avi
> Please apply this urgent fix for 2.6.28 merge. Thanks!
>
Applied, and will queue for 2.6.28. Is it needed for 2.6.26 and .27?
If not, why not?
--
error compiling committee.c: too many arguments to function
Attachment:
0001-KVM-ia64-Makefile-fix-for-forcing-to-re-generate.patch
Description: 0001-KVM-ia64-Makefile-fix-for-forcing-to-re-generate.patch
