Merge branch 'x86/cleanups' into x86/mm

Merge recent cleanups to the x86 MM code to resolve a conflict.

Conflicts:
	arch/x86/mm/fault.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/mm/fault.c
index 7b3a125e1e984ac8c796f50977ac96ef67a490e8,106b22d1d1894f66a0f1321e02006dd66ecd6f4f..525197381baa8107c513a713e867a52967e7295d
--- 1/arch/x86/mm/fault.c
--- 2/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@@ -1434,39 -1384,10 +1406,37 @@@ good_area
        }
  
        mmap_read_unlock(mm);
 -      if (unlikely(fault & VM_FAULT_ERROR)) {
 -              mm_fault_error(regs, hw_error_code, address, fault);
 +      if (likely(!(fault & VM_FAULT_ERROR)))
 +              return;
 +
 +      if (fatal_signal_pending(current) && !user_mode(regs)) {
 +              kernelmode_fixup_or_oops(regs, error_code, address, 0, 0);
                return;
        }
- 
-       check_v8086_mode(regs, address, tsk);
 +
 +      if (fault & VM_FAULT_OOM) {
 +              /* Kernel mode? Handle exceptions or die: */
 +              if (!user_mode(regs)) {
 +                      kernelmode_fixup_or_oops(regs, error_code, address,
 +                                               SIGSEGV, SEGV_MAPERR);
 +                      return;
 +              }
 +
 +              /*
 +               * We ran out of memory, call the OOM killer, and return the
 +               * userspace (which will retry the fault, or kill us if we got
 +               * oom-killed):
 +               */
 +              pagefault_out_of_memory();
 +      } else {
 +              if (fault & (VM_FAULT_SIGBUS|VM_FAULT_HWPOISON|
 +                           VM_FAULT_HWPOISON_LARGE))
 +                      do_sigbus(regs, error_code, address, fault);
 +              else if (fault & VM_FAULT_SIGSEGV)
 +                      bad_area_nosemaphore(regs, error_code, address);
 +              else
 +                      BUG();
 +      }
  }
  NOKPROBE_SYMBOL(do_user_addr_fault);