diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-08-23 12:31:58 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-08-23 12:31:58 +0800 |
| commit | 5580dff37b9e49623399cb253a7cbef82d9f776a (patch) | |
| tree | 2ec65f56daacb74da580fee7394334aa5e92aee2 /arch/arm64/mm/proc.S | |
| parent | 98fb754c57ea86c1ea5f18a82568f620d748c1bc (diff) | |
| parent | 99f614a3bb23603a947be2e95b78507112c484e5 (diff) | |
Merge tag 'v4.1.31' into linux-linaro-lsk-v4.1
This is the 4.1.31 stable release
Diffstat (limited to 'arch/arm64/mm/proc.S')
| -rw-r--r-- | arch/arm64/mm/proc.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 2081c9444327..4c58844afedf 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -168,6 +168,8 @@ ENTRY(__cpu_setup) msr cpacr_el1, x0 // Enable FP/ASIMD mov x0, #1 << 12 // Reset mdscr_el1 and disable msr mdscr_el1, x0 // access to the DCC from EL0 + isb // Unmask debug exceptions now, + enable_dbg // since this is per-cpu reset_pmuserenr_el0 x0 // Disable PMU access from EL0 /* * Memory region attributes for LPAE: |