OSDN Git Service

Merge branch 'for-next/perf' into aarch64/for-next/core
authorWill Deacon <will.deacon@arm.com>
Tue, 24 Oct 2017 15:05:15 +0000 (16:05 +0100)
committerWill Deacon <will.deacon@arm.com>
Tue, 24 Oct 2017 15:06:56 +0000 (16:06 +0100)
commit1e0c661f05ba0a3db52ed9debbe2b2e1d74aa0a4
tree671d768cd8f177f2df05970fd799778753280f32
parent611479c79a94e6713bc044b0410aa8b867375d17
parent07141342149a62db780c02f6352a0610a535eee1
Merge branch 'for-next/perf' into aarch64/for-next/core

Merge in ARM PMU and perf updates for 4.15:

  - Support for the Statistical Profiling Extension
  - Support for Hisilicon's SoC PMU

Signed-off-by: Will Deacon <will.deacon@arm.com>
arch/arm64/include/asm/sysreg.h