diff options
| author |   Mark Rutland <mark.rutland@arm.com> | 2018-07-05 15:16:52 +0100 |
|---|---|---|
| committer |   Will Deacon <will.deacon@arm.com> | 2018-07-05 17:24:14 +0100 |
| commit | d64567f67835736d65086e9bfc41a19b2863c32e (patch) | |
| tree | 74cf3df308a2f91be4aec6af5fac8456c2ae702b /arch/arm64/kernel/cpufeature.c | |
| parent | arm64: ptrace: map SPSR_ELx<->PSR for compat tasks (diff) | |
| download | linux-dev-d64567f67835736d65086e9bfc41a19b2863c32e.tar.xz linux-dev-d64567f67835736d65086e9bfc41a19b2863c32e.zip | |
arm64: use PSR_AA32 definitions
Some code cares about the SPSR_ELx format for exceptions taken from
AArch32 to inspect or manipulate the SPSR_ELx value, which is already in
the SPSR_ELx format, and not in the AArch32 PSR format.
To separate these from cases where we care about the AArch32 PSR format,
migrate these cases to use the PSR_AA32_* definitions rather than
COMPAT_PSR_*.
There should be no functional change as a result of this patch.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/cpufeature.c')
| -rw-r--r-- | arch/arm64/kernel/cpufeature.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 25d5cef00333..4b3dc9fc9c68 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1723,7 +1723,7 @@ static int emulate_mrs(struct pt_regs *regs, u32 insn) static struct undef_hook mrs_hook = { .instr_mask = 0xfff00000, .instr_val = 0xd5300000, - .pstate_mask = COMPAT_PSR_MODE_MASK, + .pstate_mask = PSR_AA32_MODE_MASK, .pstate_val = PSR_MODE_EL0t, .fn = emulate_mrs, }; |