diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-10-16 15:30:32 +0300 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-10-16 15:30:32 +0300 |
| commit | d570142674890fe10b3d7d86aa105e3dfce1ddfa (patch) | |
| tree | 8a681c3cd9e21400773e24b32f8849d0f25cf4e7 /arch/arm/include/asm/kvm_asm.h | |
| parent | f2e106692d5189303997ad7b96de8d8123aa5613 (diff) | |
| parent | a7265fb1751ffbfad553afc7f592a6dac6be48de (diff) | |
| download | op-kernel-dev-d570142674890fe10b3d7d86aa105e3dfce1ddfa.zip op-kernel-dev-d570142674890fe10b3d7d86aa105e3dfce1ddfa.tar.gz | |
Merge tag 'kvm-arm-for-3.13-1' of git://git.linaro.org/people/cdall/linux-kvm-arm into next
Updates for KVM/ARM including cpu=host and Cortex-A7 support
Diffstat (limited to 'arch/arm/include/asm/kvm_asm.h')
| -rw-r--r-- | arch/arm/include/asm/kvm_asm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/kvm_asm.h b/arch/arm/include/asm/kvm_asm.h index a2f43dd..661da11 100644 --- a/arch/arm/include/asm/kvm_asm.h +++ b/arch/arm/include/asm/kvm_asm.h @@ -39,7 +39,7 @@ #define c6_IFAR 17 /* Instruction Fault Address Register */ #define c7_PAR 18 /* Physical Address Register */ #define c7_PAR_high 19 /* PAR top 32 bits */ -#define c9_L2CTLR 20 /* Cortex A15 L2 Control Register */ +#define c9_L2CTLR 20 /* Cortex A15/A7 L2 Control Register */ #define c10_PRRR 21 /* Primary Region Remap Register */ #define c10_NMRR 22 /* Normal Memory Remap Register */ #define c12_VBAR 23 /* Vector Base Address Register */ |
