Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / x86 / mm / fault.c

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index b74a7e1..38dcec4 100644 (file)
--- 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: */