Commit 087713f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
  KVM: fix userspace ABI breakage
  KVM: MMU: Fix torn shadow pte
  KVM: Use .fixup instead of .text.fixup on __kvm_handle_fault_on_reboot
parents 7cf0bed9 1327138e

arch/x86/kvm/paging_tmpl.h

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, 
		shadow_addr = __pa(shadow_page->spt);

		shadow_pte = shadow_addr | PT_PRESENT_MASK | PT_ACCESSED_MASK

			| PT_WRITABLE_MASK | PT_USER_MASK;

		*shadow_ent = shadow_pte;

		set_shadow_pte(shadow_ent, shadow_pte);

	}



	mmu_set_spte(vcpu, shadow_ent, access, walker->pte_access & access,

include/asm-x86/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -722,7 +722,7 @@ asmlinkage void kvm_handle_fault_on_reboot(void); 


#define __kvm_handle_fault_on_reboot(insn) \

	"666: " insn "\n\t" \

	".pushsection .text.fixup, \"ax\" \n" \

	".pushsection .fixup, \"ax\" \n" \

	"667: \n\t" \

	KVM_EX_PUSH " $666b \n\t" \

	"jmp kvm_handle_fault_on_reboot \n\t" \

include/linux/kvm.h

+2 −2
Original line number Diff line number Diff line
@@ -320,12 +320,12 @@ struct kvm_trace_rec { 
		struct {

			__u64 cycle_u64;

			__u32 extra_u32[KVM_TRC_EXTRA_MAX];

		} cycle;

		} __attribute__((packed)) cycle;

		struct {

			__u32 extra_u32[KVM_TRC_EXTRA_MAX];

		} nocycle;

	} u;

} __attribute__((packed));

};



#define KVMIO 0xAE