Merge tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg...

[~andy/linux] / arch / arm / kvm / coproc.c

diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c
index d782638c7ec0acaac090ed549515b5f28953b8a0..4ea9a982269c8f9c9c56808f92b464a025356533 100644 (file)
--- a/arch/arm/kvm/coproc.c
+++ b/arch/arm/kvm/coproc.c
@@ -222,6 +222,10 @@ static const struct coproc_reg cp15_regs[] = {
                        NULL, reset_unknown, c13_TID_URO },
        { CRn(13), CRm( 0), Op1( 0), Op2( 4), is32,
                        NULL, reset_unknown, c13_TID_PRIV },
+
+       /* CNTKCTL: swapped by interrupt.S. */
+       { CRn(14), CRm( 1), Op1( 0), Op2( 0), is32,
+                       NULL, reset_val, c14_CNTKCTL, 0x00000000 },
 };
 
 /* Target specific emulation tables */