diff options
| author | Avi Kivity <avi@redhat.com> | 2008-10-23 07:46:40 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-10-23 07:46:40 +0200 |
| commit | ddfe2d857f3df6d9b9c2296d4621bc8c429aa3a4 (patch) | |
| tree | 8867a3d419191362ad49c6bc304979243f5e0c59 | |
| parent | f2f8b3b33fac307120fa148fd8e481e887c09cd2 (diff) | |
Revert "KVM: ia64: Makefile fix for forcing to re-generate asm-offsets.h"
This reverts commit d6f9e28239fd6ac6ace6e72b44c257ed3936fdd5, which breaks
the ia64 build.
Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | arch/ia64/kvm/Makefile | 3 | ||||
| -rw-r--r-- | include/linux/kvm_host.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile index 53c7a4837925..cf37f8f490c0 100644 --- a/arch/ia64/kvm/Makefile +++ b/arch/ia64/kvm/Makefile @@ -30,7 +30,7 @@ define cmd_offsets 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 FORCE +arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c $(call if_changed_dep,cc_s_c) $(obj)/$(offsets-file): arch/ia64/kvm/asm-offsets.s @@ -53,6 +53,7 @@ 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 diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 3a0fb77d1f6a..66a6fad42de6 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -37,7 +37,7 @@ #define KVM_REQ_UNHALT 6 #define KVM_REQ_MMU_SYNC 7 -#define KVM_USERSPACE_IRQ_SOURCE_ID 0 +#define KVM_USERSPACE_IRQ_SOURCE_ID (1 << 0) struct kvm_vcpu; extern struct kmem_cache *kvm_vcpu_cache; |