diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2015-01-15 15:44:44 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2015-01-15 15:44:44 +0000 |
| commit | 0ce339a9e60d417e2747ff7c4869d9691a606e49 (patch) | |
| tree | 5b86390afa1ff86706b2c2cba9e3953f1e412e45 /arch/arm64/mm | |
| parent | 5d425c18653731af62831d30a4fa023d532657a9 (diff) | |
| parent | 056bb5f51c357ee00046fde4929a03468ff45e7a (diff) | |
| download | blackbird-op-linux-0ce339a9e60d417e2747ff7c4869d9691a606e49.tar.gz blackbird-op-linux-0ce339a9e60d417e2747ff7c4869d9691a606e49.zip | |
Merge branch 'arm64/common-esr-macros' of git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux
ESR_ELx definitions clean-up from Mark Rutland.
* 'arm64/common-esr-macros' of git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux:
arm64: kvm: decode ESR_ELx.EC when reporting exceptions
arm64: kvm: remove ESR_EL2_* macros
arm64: remove ESR_EL1_* macros
arm64: kvm: move to ESR_ELx macros
arm64: decode ESR_ELx.EC when reporting exceptions
arm64: move to ESR_ELx macros
arm64: introduce common ESR_ELx_* definitions
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; } |
