Merge branch 'linus' into release

Conflicts:
	drivers/acpi/debug.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index f62777940dfb..4c4508e8a204 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -802,8 +802,10 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
         up_read(&mm->mmap_sem);
 
         /* Kernel mode? Handle exceptions or die: */
-        if (!(error_code & PF_USER))
+        if (!(error_code & PF_USER)) {
                 no_context(regs, error_code, address);
+                return;
+        }
 
         /* User-space => ok to do another page fault: */
         if (is_prefetch(regs, error_code, address))