diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2016-10-28 10:44:19 -0700 |
---|---|---|
committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-10-28 10:44:19 -0700 |
commit | c302df26cb5bf9f60633785cf5b5ed162a138dfe (patch) | |
tree | d7e1f042a5a478a616010ff42e27fbf1547eca8e /arch/arm64/kernel | |
parent | a979feb9e9f1827463f61ad241b198aa7dc27cd3 (diff) | |
parent | c843445f19f4e6f05b32125d7556958f98033999 (diff) |
Merge tag 'v4.4.28' into android-4.4.y
This is the 4.4.28 stable release
Diffstat (limited to 'arch/arm64/kernel')
-rw-r--r-- | arch/arm64/kernel/head.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 461d6cc258dd..99710399aa38 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -592,8 +592,9 @@ CPU_LE( movk x0, #0x30d0, lsl #16 ) // Clear EE and E0E on LE systems b.lt 4f // Skip if no PMU present mrs x0, pmcr_el0 // Disable debug access traps ubfx x0, x0, #11, #5 // to EL2 and allow access to - msr mdcr_el2, x0 // all PMU counters from EL1 4: + csel x0, xzr, x0, lt // all PMU counters from EL1 + msr mdcr_el2, x0 // (if they exist) /* Stage-2 translation */ msr vttbr_el2, xzr |