diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-02 15:56:17 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-02 15:56:17 -0800 |
commit | b7d626606201c397319b40721ca558b7e54040d5 (patch) | |
tree | 465c4004c514c3d47f4f7f60bed99cb19b8e5ec8 /arch/ia64/kvm/Makefile | |
parent | e6d9f0fb5f9ceca5f4945f12cd3e71efd3382c13 (diff) | |
parent | 6c475352e87224a8f0b8cc6f6cc96b30563dc5b4 (diff) | |
download | op-kernel-dev-b7d626606201c397319b40721ca558b7e54040d5.zip op-kernel-dev-b7d626606201c397319b40721ca558b7e54040d5.tar.gz |
Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
* 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
KVM: MMU: avoid creation of unreachable pages in the shadow
KVM: ppc: stop leaking host memory on VM exit
KVM: MMU: fix sync of ptes addressed at owner pagetable
KVM: ia64: Fix: Use correct calling convention for PAL_VPS_RESUME_HANDLER
KVM: ia64: Fix incorrect kbuild CFLAGS override
KVM: VMX: Fix interrupt loss during race with NMI
KVM: s390: Fix problem state handling in guest sigp handler
Diffstat (limited to 'arch/ia64/kvm/Makefile')
-rw-r--r-- | arch/ia64/kvm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile index 3ab4d6d..92cef66 100644 --- a/arch/ia64/kvm/Makefile +++ b/arch/ia64/kvm/Makefile @@ -58,7 +58,7 @@ endif kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o obj-$(CONFIG_KVM) += kvm.o -EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127 +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 |