d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove armv6 specific part from armv4 specific file and update comment.

Browse Source 
No functional change.
This commit is contained in:
Svatopluk Kraus 2016-02-22 12:57:08 +00:00
parent 7758916f44
commit eb21eee06e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=295887
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/arm/arm/trap-v4.c
View File

@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_map.h> #include <vm/vm_map.h>
#include <vm/vm_extern.h> #include <vm/vm_extern.h>
#include <machine/acle-compat.h>
#include <machine/cpu.h> #include <machine/cpu.h>
#include <machine/frame.h> #include <machine/frame.h>
#include <machine/machdep.h> #include <machine/machdep.h>
@ -312,16 +311,13 @@ abort_handler(struct trapframe *tf, int type)
} }
/* /*
* We need to know whether the page should be mapped as R or R/W. On * We need to know whether the page should be mapped as R or R/W.
* armv6 and later the fault status register indicates whether the * On armv4, the fault status register does not indicate whether
* access was a read or write. Prior to armv6, we know that a * the access was a read or write. We know that a permission fault
* permission fault can only be the result of a write to a read-only * can only be the result of a write to a read-only location, so we
* location, so we can deal with those quickly. Otherwise we need to * can deal with those quickly. Otherwise we need to disassemble
* disassemble the faulting instruction to determine if it was a write. * the faulting instruction to determine if it was a write.
*/ */
#if __ARM_ARCH >= 6
ftype = (fsr & FAULT_WNR) ? VM_PROT_READ | VM_PROT_WRITE : VM_PROT_READ;
#else
if (IS_PERMISSION_FAULT(fsr)) if (IS_PERMISSION_FAULT(fsr))
ftype = VM_PROT_WRITE; ftype = VM_PROT_WRITE;
else { else {
@ -338,7 +334,6 @@ abort_handler(struct trapframe *tf, int type)
ftype = VM_PROT_READ; ftype = VM_PROT_READ;
} }
} }
#endif
/* /*
* See if the fault is as a result of ref/mod emulation, * See if the fault is as a result of ref/mod emulation,