x86: access_error API cleanup
access_error() already takes error_code as an argument, so there is no need for an additional write flag. Signed-off-by: Michel Lespinasse <walken@google.com> Acked-by: Rik van Riel <riel@redhat.com> Cc: Nick Piggin <nickpiggin@yahoo.com.au> Acked-by: Wu Fengguang <fengguang.wu@intel.com> Cc: Ying Han <yinghan@google.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Acked-by: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
d065bd810b
commit
68da336a14
|
@ -919,9 +919,9 @@ spurious_fault(unsigned long error_code, unsigned long address)
|
||||||
int show_unhandled_signals = 1;
|
int show_unhandled_signals = 1;
|
||||||
|
|
||||||
static inline int
|
static inline int
|
||||||
access_error(unsigned long error_code, int write, struct vm_area_struct *vma)
|
access_error(unsigned long error_code, struct vm_area_struct *vma)
|
||||||
{
|
{
|
||||||
if (write) {
|
if (error_code & PF_WRITE) {
|
||||||
/* write, present and write, not present: */
|
/* write, present and write, not present: */
|
||||||
if (unlikely(!(vma->vm_flags & VM_WRITE)))
|
if (unlikely(!(vma->vm_flags & VM_WRITE)))
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -1114,7 +1114,7 @@ retry:
|
||||||
* we can handle it..
|
* we can handle it..
|
||||||
*/
|
*/
|
||||||
good_area:
|
good_area:
|
||||||
if (unlikely(access_error(error_code, write, vma))) {
|
if (unlikely(access_error(error_code, vma))) {
|
||||||
bad_area_access_error(regs, error_code, address);
|
bad_area_access_error(regs, error_code, address);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue