diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2014-11-24 13:31:40 +0100 |
|---|---|---|
| committer | Mark Rutland <mark.rutland@arm.com> | 2015-01-15 13:24:15 +0100 |
| commit | aed40e0144bdbdadb45f2b623e07aa3157eb74c9 (patch) | |
| tree | bc05d0df58e856feca64dfa966e1204eeb00ef20 /arch/arm64/mm | |
| parent | arm64: introduce common ESR_ELx_* definitions (diff) | |
| download | linux-aed40e0144bdbdadb45f2b623e07aa3157eb74c9.tar.xz linux-aed40e0144bdbdadb45f2b623e07aa3157eb74c9.zip | |
arm64: move to ESR_ELx macros
Now that we have common ESR_ELx_* macros, move the core arm64 code over
to them.
There should be no functional change as a result of this patch.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/mm')
| -rw-r--r-- | arch/arm64/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index c11cd27ca8f5..96da13167d4a 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -219,7 +219,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, if (esr & ESR_LNX_EXEC) { vm_flags = VM_EXEC; - } else if ((esr & ESR_EL1_WRITE) && !(esr & ESR_EL1_CM)) { + } else if ((esr & ESR_ELx_WNR) && !(esr & ESR_ELx_CM)) { vm_flags = VM_WRITE; mm_flags |= FAULT_FLAG_WRITE; } |