Commit 23125c40 authored by Marcelo Tosatti's avatar Marcelo Tosatti
Browse files

Merge branch 'kvm-arm-fixes-3.9' of git://github.com/columbia/linux-kvm-arm 

* 'kvm-arm-fixes-3.9' of git://github.com/columbia/linux-kvm-arm

:
  ARM: KVM: fix L_PTE_S2_RDWR to actually be Read/Write
  ARM: KVM: fix KVM_CAP_ARM_SET_DEVICE_ADDR reporting

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parents 4d2be6f7 865499ea

arch/arm/include/asm/pgtable-3level.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ 
#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2) /* MemAttr[3:0] */

#define L_PTE_S2_MT_WRITEBACK	 (_AT(pteval_t, 0xf) << 2) /* MemAttr[3:0] */

#define L_PTE_S2_RDONLY		 (_AT(pteval_t, 1) << 6)   /* HAP[1]   */

#define L_PTE_S2_RDWR		 (_AT(pteval_t, 2) << 6)   /* HAP[2:1] */

#define L_PTE_S2_RDWR		 (_AT(pteval_t, 3) << 6)   /* HAP[2:1] */



/*

 * Hyp-mode PL2 PTE definitions for LPAE.

arch/arm/kvm/arm.c

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ int kvm_dev_ioctl_check_extension(long ext) 
		break;

	case KVM_CAP_ARM_SET_DEVICE_ADDR:

		r = 1;

		break;

	case KVM_CAP_NR_VCPUS:

		r = num_online_cpus();

		break;