diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-17 20:52:37 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-17 20:52:37 +0100 |
| commit | cf3c0a1579eff90195a791c5f464463c1011ef4a (patch) | |
| tree | e66fcbf1d65d1a43b9efde092045890f6aa52487 /arch/x86/mm | |
| parent | Merge tag 'vfio-v3.19-rc1' of git://github.com/awilliam/linux-vfio (diff) | |
| download | linux-cf3c0a1579eff90195a791c5f464463c1011ef4a.tar.xz linux-cf3c0a1579eff90195a791c5f464463c1011ef4a.zip | |
x86: mm: fix VM_FAULT_RETRY handling
My commit 26178ec11ef3 ("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>
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index b74a7e130b03..38dcec403b46 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -1247,7 +1247,7 @@ good_area: } /* 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: */ |