From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 20 Jun 2009 17:49:48 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: accepted/tizen/common/20141203.182822~15522
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c4c5ab3089c8a794eb0bdaa9794d0f055dd82412;p=platform%2Fkernel%2Flinux-arm64.git

Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (45 commits)
  x86, mce: fix error path in mce_create_device()
  x86: use zalloc_cpumask_var for mce_dev_initialized
  x86: fix duplicated sysfs attribute
  x86: de-assembler-ize asm/desc.h
  i386: fix/simplify espfix stack switching, move it into assembly
  i386: fix return to 16-bit stack from NMI handler
  x86, ioapic: Don't call disconnect_bsp_APIC if no APIC present
  x86: Remove duplicated #include's
  x86: msr.h linux/types.h is only required for __KERNEL__
  x86: nmi: Add Intel processor 0x6f4 to NMI perfctr1 workaround
  x86, mce: mce_intel.c needs <asm/apic.h>
  x86: apic/io_apic.c: dmar_msi_type should be static
  x86, io_apic.c: Work around compiler warning
  x86: mce: Don't touch THERMAL_APIC_VECTOR if no active APIC present
  x86: mce: Handle banks == 0 case in K7 quirk
  x86, boot: use .code16gcc instead of .code16
  x86: correct the conversion of EFI memory types
  x86: cap iomem_resource to addressable physical memory
  x86, mce: rename _64.c files which are no longer 64-bit-specific
  x86, mce: mce.h cleanup
  ...

Manually fix up trivial conflict in arch/x86/mm/fault.c
---

c4c5ab3089c8a794eb0bdaa9794d0f055dd82412
diff --cc arch/x86/mm/fault.c
index baa0e86,0482fa6..c403526
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@@ -955,14 -954,7 +955,13 @@@ do_page_fault(struct pt_regs *regs, uns
  	/* Get the faulting address: */
  	address = read_cr2();
  
 +	/*
 +	 * Detect and handle instructions that would cause a page fault for
 +	 * both a tracked kernel page and a userspace page.
 +	 */
 +	if (kmemcheck_active(regs))
 +		kmemcheck_hide(regs);
+ 	prefetchw(&mm->mmap_sem);
  
  	if (unlikely(kmmio_fault(regs, address)))
  		return;