Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, AMD IOMMU: include amd_iommu_last_bdf in device initialization
  x86: fix IBM Summit based systems' phys_cpu_present_map on 32-bit kernels
  x86, RDC321x: remove gpio.h complications
  x86, RDC321x: add to mach-default
  crashdump: fix undefined reference to `elfcorehdr_addr'
  flag parameters: fix compile error of sys_epoll_create1

diff --combined arch/x86/Kconfig
index 6bdde845818e968386769505cb3d926975dd124b,39ae67985950791b5b8d21af7a1442a5895f979e..b6fa2877b1734aad723805c2e5518fe301f3443d
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -22,9 -22,8 +22,9 @@@ config X8
        select HAVE_IDE
        select HAVE_OPROFILE
        select HAVE_IOREMAP_PROT
 +      select HAVE_GET_USER_PAGES_FAST
        select HAVE_KPROBES
-       select ARCH_WANT_OPTIONAL_GPIOLIB if !X86_RDC321X
+       select ARCH_WANT_OPTIONAL_GPIOLIB
        select HAVE_KRETPROBES
        select HAVE_DYNAMIC_FTRACE
        select HAVE_FTRACE
@@@ -333,20 -332,6 +333,6 @@@ config X86_BIGSM
  
  endif
  
- config X86_RDC321X
-       bool "RDC R-321x SoC"
-       depends on X86_32
-       select M486
-       select X86_REBOOTFIXUPS
-       select GENERIC_GPIO
-       select LEDS_CLASS
-       select LEDS_GPIO
-       select NEW_LEDS
-       help
-         This option is needed for RDC R-321x system-on-chip, also known
-         as R-8610-(G).
-         If you don't have one of these chips, you should say N here.
- 
  config X86_VSMP
        bool "Support for ScaleMP vSMP"
        select PARAVIRT
@@@ -370,6 -355,16 +356,16 @@@ config X86_VISW
          A kernel compiled for the Visual Workstation will run on general
          PCs as well. See <file:Documentation/sgi-visws.txt> for details.
  
+ config X86_RDC321X
+       bool "RDC R-321x SoC"
+       depends on X86_32
+       select M486
+       select X86_REBOOTFIXUPS
+       help
+         This option is needed for RDC R-321x system-on-chip, also known
+         as R-8610-(G).
+         If you don't have one of these chips, you should say N here.
+ 
  config SCHED_NO_NO_OMIT_FRAME_POINTER
        def_bool y
        prompt "Single-depth WCHAN output"
@@@ -1280,14 -1275,6 +1276,14 @@@ config CRASH_DUM
          (CONFIG_RELOCATABLE=y).
          For more details see Documentation/kdump/kdump.txt
  
 +config KEXEC_JUMP
 +      bool "kexec jump (EXPERIMENTAL)"
 +      depends on EXPERIMENTAL
 +      depends on KEXEC && HIBERNATION && X86_32
 +      help
 +        Jump between original kernel and kexeced kernel and invoke
 +        code in physical address mode via KEXEC
 +
  config PHYSICAL_START
        hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
        default "0x1000000" if X86_NUMAQ