diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-29 06:44:43 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-29 06:44:43 -0400 |
| commit | 3c0c01ab742ddfaf6b6f2d64b890e77cda4b7727 (patch) | |
| tree | d0f196c53d209f44190fd8a6481823b7770866e6 /arch/arm/kvm | |
| parent | cbd379b10019617457bda31eb243890f4377fa3e (diff) | |
| parent | 809e660f438fc5a69bf57630a85bcd8112263f37 (diff) | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/Makefile
arch/arm/include/asm/glue-proc.h
Diffstat (limited to 'arch/arm/kvm')
| -rw-r--r-- | arch/arm/kvm/interrupts_head.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/kvm/interrupts_head.S b/arch/arm/kvm/interrupts_head.S index 3c8f2f0b4c5e..d43cfb5b37c4 100644 --- a/arch/arm/kvm/interrupts_head.S +++ b/arch/arm/kvm/interrupts_head.S | |||
| @@ -497,6 +497,10 @@ vcpu .req r0 @ vcpu pointer always in r0 | |||
| 497 | add r5, vcpu, r4 | 497 | add r5, vcpu, r4 |
| 498 | strd r2, r3, [r5] | 498 | strd r2, r3, [r5] |
| 499 | 499 | ||
| 500 | @ Ensure host CNTVCT == CNTPCT | ||
| 501 | mov r2, #0 | ||
| 502 | mcrr p15, 4, r2, r2, c14 @ CNTVOFF | ||
| 503 | |||
| 500 | 1: | 504 | 1: |
| 501 | #endif | 505 | #endif |
| 502 | @ Allow physical timer/counter access for the host | 506 | @ Allow physical timer/counter access for the host |