arm64: Cleanup SCTLR flags
authorGeoff Levand <geoff@infradead.org>
Wed, 27 Apr 2016 16:47:01 +0000 (17:47 +0100)
committerAlex Shi <alex.shi@linaro.org>
Thu, 10 Nov 2016 07:43:58 +0000 (15:43 +0800)
commit46f269e394b70c332389818cb378a84f27026f24
tree767eb48720cf1ea8125c5d4e93b0845b654573a0
parenta7ba39df2de41823e8b0dcda1ab183e71feb988a
arm64: Cleanup SCTLR flags

We currently have macros defining flags for the arm64 sctlr registers in
both kvm_arm.h and sysreg.h.  To clean things up and simplify move the
definitions of the SCTLR_EL2 flags from kvm_arm.h to sysreg.h, rename any
SCTLR_EL1 or SCTLR_EL2 flags that are common to both registers to be
SCTLR_ELx, with 'x' indicating a common flag, and fixup all files to
include the proper header or to use the new macro names.

Signed-off-by: Geoff Levand <geoff@infradead.org>
[Restored pgtable-hwdef.h include]
Signed-off-by: James Morse <james.morse@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
(cherry picked from commit e7227d0e528f9a96d4a866f43e20dd9b33f0e782)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
arch/arm64/include/asm/kvm_arm.h
arch/arm64/include/asm/sysreg.h
arch/arm64/kvm/hyp-init.S