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

Commit 88d53766 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm 

* 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
  KVM: LAPIC: ignore pending timers if LVTT is disabled
  KVM: Update MAINTAINERS for new mailing lists
  KVM: Fix kvm_vcpu_block() task state race
  KVM: ia64: Set KVM_IOAPIC_NUM_PINS to 48
  KVM: ia64: fix GVMM module including position-dependent objects
  KVM: ia64: Define new kvm_fpreg struture to replace ia64_fpreg
  KVM: PIT: take inject_pending into account when emulating hlt
  s390: KVM guest: fix compile error
  KVM: x86 emulator: fix writes to registers with modrm encodings
parents 860da5e5 54aaacee

MAINTAINERS

+7 −7
Original line number Diff line number Diff line
@@ -2352,15 +2352,15 @@ S: Supported 
KERNEL VIRTUAL MACHINE (KVM)

P:	Avi Kivity

M:	avi@qumranet.com

L:	kvm-devel@lists.sourceforge.net

W:	kvm.sourceforge.net

L:	kvm@vger.kernel.org

W:	http://kvm.qumranet.com

S:	Supported



KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC

P:	Hollis Blanchard

M:	hollisb@us.ibm.com

L:	kvm-ppc-devel@lists.sourceforge.net

W:	kvm.sourceforge.net

L:	kvm-ppc@vger.kernel.org

W:	http://kvm.qumranet.com

S:	Supported



KERNEL VIRTUAL MACHINE For Itanium (KVM/IA64)
@@ -2368,8 +2368,8 @@ P: Anthony Xu 
M:	anthony.xu@intel.com

P:	Xiantao Zhang

M:	xiantao.zhang@intel.com

L:	kvm-ia64-devel@lists.sourceforge.net

W:	kvm.sourceforge.net

L:	kvm-ia64@vger.kernel.org

W:	http://kvm.qumranet.com

S:	Supported



KERNEL VIRTUAL MACHINE for s390 (KVM/s390)

arch/ia64/kvm/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ offsets-file := asm-offsets.h 
always  := $(offsets-file)

targets := $(offsets-file)

targets += arch/ia64/kvm/asm-offsets.s

clean-files := $(addprefix $(objtree)/,$(targets) $(obj)/memcpy.S $(obj)/memset.S)



# Default sed regexp - multiline due to syntax constraints

define sed-y
@@ -54,5 +53,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 += ../lib/memset.o ../lib/memcpy.o

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

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

arch/ia64/kvm/memcpy.S

0 → 100644
+1 −0
Original line number Diff line number Diff line 
#include "../lib/memcpy.S"

arch/ia64/kvm/memset.S

0 → 100644
+1 −0
Original line number Diff line number Diff line 
#include "../lib/memset.S"

arch/x86/kvm/i8254.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ int pit_has_pending_timer(struct kvm_vcpu *vcpu) 
{

	struct kvm_pit *pit = vcpu->kvm->arch.vpit;



	if (pit && vcpu->vcpu_id == 0)

	if (pit && vcpu->vcpu_id == 0 && pit->pit_state.inject_pending)

		return atomic_read(&pit->pit_state.pit_timer.pending);



	return 0;