p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

x86: mm: fix VM_FAULT_RETRY handling 

My commit 26178ec11e ("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>
This commit is contained in:
Linus Torvalds 2014-12-17 11:52:37 -08:00
parent cc669743a3
commit cf3c0a1579
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/mm/fault.c
View File

@ -1247,7 +1247,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
} }
/* User mode? Just return to handle the fatal exception */ /* User mode? Just return to handle the fatal exception */
if (fault & FAULT_FLAG_USER) if (flags & FAULT_FLAG_USER)
return; return;
/* Not returning to user mode? Handle exceptions or die: */ /* Not returning to user mode? Handle exceptions or die: */