diff options
| author | David S. Miller <davem@davemloft.net> | 2020-01-26 10:40:21 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-26 10:40:21 +0100 |
| commit | 4d8773b68e83558025303f266070b31bc4101e73 (patch) | |
| tree | 151cafa469fbc6a411d36b58ab802f67869cc0bb /arch/arm/kernel/hyp-stub.S | |
| parent | 3333e50b64fe30b7e53cf02456a2f567f689ae4f (diff) | |
| parent | 2821e26f3a0a3872184581caac8115bb02641941 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflict in mlx5 because changes happened to code that has
moved meanwhile.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/kernel/hyp-stub.S')
| -rw-r--r-- | arch/arm/kernel/hyp-stub.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index ae5020302de4..6607fa817bba 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -146,10 +146,9 @@ ARM_BE8(orr r7, r7, #(1 << 25)) @ HSCTLR.EE #if !defined(ZIMAGE) && defined(CONFIG_ARM_ARCH_TIMER) @ make CNTP_* and CNTPCT accessible from PL1 mrc p15, 0, r7, c0, c1, 1 @ ID_PFR1 - lsr r7, #16 - and r7, #0xf - cmp r7, #1 - bne 1f + ubfx r7, r7, #16, #4 + teq r7, #0 + beq 1f mrc p15, 4, r7, c14, c1, 0 @ CNTHCTL orr r7, r7, #3 @ PL1PCEN | PL1PCTEN mcr p15, 4, r7, c14, c1, 0 @ CNTHCTL |