Merge branch 'kvm-ppc-3.8' of https://github.com/agraf/linux-2.6 into master (18eb54cf) · Commits · e / devices / android_kernel_teracube_emerald

arch/powerpc/include/uapi/asm/kvm_para.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ struct kvm_vcpu_arch_shared {

		#define KVM_HCALL_TOKEN(num) _EV_HCALL_TOKEN(EV_KVM_VENDOR_ID, num)

		#include <uapi/asm/epapr_hcalls.h>
		#include <asm/epapr_hcalls.h>

		#define KVM_FEATURE_MAGIC_PAGE 1