diff options
Diffstat (limited to 'arch/arm/include')
-rw-r--r-- | arch/arm/include/asm/kvm_asm.h | 2 | ||||
-rw-r--r-- | arch/arm/include/uapi/asm/kvm.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/include/asm/kvm_asm.h b/arch/arm/include/asm/kvm_asm.h index a2f43ddcc300..661da11f76f4 100644 --- a/arch/arm/include/asm/kvm_asm.h +++ b/arch/arm/include/asm/kvm_asm.h | |||
@@ -39,7 +39,7 @@ | |||
39 | #define c6_IFAR 17 /* Instruction Fault Address Register */ | 39 | #define c6_IFAR 17 /* Instruction Fault Address Register */ |
40 | #define c7_PAR 18 /* Physical Address Register */ | 40 | #define c7_PAR 18 /* Physical Address Register */ |
41 | #define c7_PAR_high 19 /* PAR top 32 bits */ | 41 | #define c7_PAR_high 19 /* PAR top 32 bits */ |
42 | #define c9_L2CTLR 20 /* Cortex A15 L2 Control Register */ | 42 | #define c9_L2CTLR 20 /* Cortex A15/A7 L2 Control Register */ |
43 | #define c10_PRRR 21 /* Primary Region Remap Register */ | 43 | #define c10_PRRR 21 /* Primary Region Remap Register */ |
44 | #define c10_NMRR 22 /* Normal Memory Remap Register */ | 44 | #define c10_NMRR 22 /* Normal Memory Remap Register */ |
45 | #define c12_VBAR 23 /* Vector Base Address Register */ | 45 | #define c12_VBAR 23 /* Vector Base Address Register */ |
diff --git a/arch/arm/include/uapi/asm/kvm.h b/arch/arm/include/uapi/asm/kvm.h index c1ee007523d7..c498b60c0505 100644 --- a/arch/arm/include/uapi/asm/kvm.h +++ b/arch/arm/include/uapi/asm/kvm.h | |||
@@ -63,7 +63,8 @@ struct kvm_regs { | |||
63 | 63 | ||
64 | /* Supported Processor Types */ | 64 | /* Supported Processor Types */ |
65 | #define KVM_ARM_TARGET_CORTEX_A15 0 | 65 | #define KVM_ARM_TARGET_CORTEX_A15 0 |
66 | #define KVM_ARM_NUM_TARGETS 1 | 66 | #define KVM_ARM_TARGET_CORTEX_A7 1 |
67 | #define KVM_ARM_NUM_TARGETS 2 | ||
67 | 68 | ||
68 | /* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */ | 69 | /* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */ |
69 | #define KVM_ARM_DEVICE_TYPE_SHIFT 0 | 70 | #define KVM_ARM_DEVICE_TYPE_SHIFT 0 |