Skip to content

Commit

Permalink
x86: mm: fix VM_FAULT_RETRY handling
Browse files Browse the repository at this point in the history
My commit 26178ec ("x86: mm: consolidate VM_FAULT_RETRY handling")
had a really stupid typo: the FAULT_FLAG_USER bit is in the 'flags'
variable, not the 'fault' variable. Duh,

The one silver lining in this is that Dave finding this at least
confirms that trinity actually triggers this special path easily, in a
way normal use does not.

Reported-by: Dave Jones <davej@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Linus Torvalds committed Dec 17, 2014
1 parent cc66974 commit cf3c0a1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/x86/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
}

/* User mode? Just return to handle the fatal exception */
if (fault & FAULT_FLAG_USER)
if (flags & FAULT_FLAG_USER)
return;

/* Not returning to user mode? Handle exceptions or die: */
Expand Down

0 comments on commit cf3c0a1

Please sign in to comment.