Merge branches 'x86/apic', 'x86/cpu', 'x86/fixmap', 'x86/mm', 'x86/sched', 'x86/setup...

diff --cc Documentation/x86/boot.txt
Simple merge

diff --cc arch/x86/Kconfig
index 5e2919c0ff922a86c5c965c38a6628ba15f49edf,1042d69b267d4489e78365b27ec158d10d06d0c7,5e2919c0ff922a86c5c965c38a6628ba15f49edf,8955262caa34e56c5704d56ba2d4c758283bc0c7,d9084320279e6e1cc07933dd088d9ac3dd612c63,7b66c34d0aae07a2d04d914d4095572f5597d190,5e2919c0ff922a86c5c965c38a6628ba15f49edf,bc2fbadff9f90fe681d9c30ae621d1ec94e348cf..469f3450bf813af117549a3234b73be12041d0d3
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
--- 3/arch/x86/Kconfig
--- 4/arch/x86/Kconfig
--- 5/arch/x86/Kconfig
--- 6/arch/x86/Kconfig
--- 7/arch/x86/Kconfig
--- 8/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@@@@@@@ -235,20 -235,6 -235,20 -235,20 -235,20 -246,10 -235,20 -244,10 +238,20 @@@@@@@@@ config SM
        
                  If you don't know what to do here, say N.
        
     - -config X86_HAS_BOOT_CPU_ID
     - -        def_bool y
     - -        depends on X86_VOYAGER
 +   + +config X86_X2APIC
 +   + +        bool "Support x2apic"
 +   + +        depends on X86_LOCAL_APIC && X86_64
 +   + +        ---help---
 +   + +          This enables x2apic support on CPUs that have this feature.
 +   + +
 +   + +          This allows 32-bit apic IDs (so it can support very large systems),
 +   + +          and accesses the local apic via MSRs not via mmio.
 +   + +
 +   + +          ( On certain CPU models you may need to enable INTR_REMAP too,
 +   + +            to get functional x2apic mode. )
 +   + +
 +   + +          If you don't know what to do here, say N.
 +      
        config SPARSE_IRQ
                bool "Support sparse irq numbering"
                depends on PCI_MSI || HT_IRQ
@@@@@@@@@ -279,75 -265,49 -279,75 -279,50 -279,75 -284,14 -279,75 -282,14 +282,75 @@@@@@@@@ config X86_MPPARS
                  For old smp systems that do not have proper acpi support. Newer systems
                  (esp with 64bit cpus) with acpi support, MADT and DSDT will override it
        
     - -choice
     - -        prompt "Subarchitecture Type"
     - -        default X86_PC
     + +config X86_BIGSMP
     + +        bool "Support for big SMP systems with more than 8 CPUs"
     + +        depends on X86_32 && SMP
     + +        ---help---
     + +          This option is needed for the systems that have more than 8 CPUs
        
     - -config X86_PC
     - -        bool "PC-compatible"
     - -        help
     - -          Choose this option if your computer is a standard PC or compatible.
 + + + +if X86_32
     + +config X86_EXTENDED_PLATFORM
     + +        bool "Support for extended (non-PC) x86 platforms"
     + +        default y
     + +        ---help---
     + +          If you disable this option then the kernel will only support
     + +          standard PC platforms. (which covers the vast majority of
     + +          systems out there.)
     + +
 - -              If you enable this option then you'll be able to select a number
 - -              of non-PC x86 platforms.
 + + + +          If you enable this option then you'll be able to select support
 + + + +          for the following (non-PC) 32 bit x86 platforms:
 + + + +                AMD Elan
 + + + +                NUMAQ (IBM/Sequent)
 + + + +                RDC R-321x SoC
 + + + +                SGI 320/540 (Visual Workstation)
 + + + +                Summit/EXA (IBM x440)
 + + + +                Unisys ES7000 IA32 series
     + +
     + +          If you have one of these systems, or if you want to build a
     + +          generic distribution kernel, say Y here - otherwise say N.
 + + + +endif
   + + +
 + + + +if X86_64
 + + + +config X86_EXTENDED_PLATFORM
 + + + +        bool "Support for extended (non-PC) x86 platforms"
 + + + +        default y
 + + + +        ---help---
 + + + +          If you disable this option then the kernel will only support
 + + + +          standard PC platforms. (which covers the vast majority of
 + + + +          systems out there.)
 + + + +
 + + + +          If you enable this option then you'll be able to select support
 + + + +          for the following (non-PC) 64 bit x86 platforms:
 + + + +                ScaleMP vSMP
 + + + +                SGI Ultraviolet
 +   + +
 + + + +          If you have one of these systems, or if you want to build a
 + + + +          generic distribution kernel, say Y here - otherwise say N.
 + + + +endif
     + +# This is an alphabetically sorted list of 64 bit extended platforms
     + +# Please maintain the alphabetic order if and when there are additions
     + +
     + +config X86_VSMP
     + +        bool "ScaleMP vSMP"
     + +        select PARAVIRT
     + +        depends on X86_64 && PCI
     + +        depends on X86_EXTENDED_PLATFORM
     + +        ---help---
     + +          Support for ScaleMP vSMP systems.  Say 'Y' here if this kernel is
     + +          supposed to run on these EM64T-based machines.  Only choose this option
     + +          if you have one of these machines.
     + +
     + +config X86_UV
     + +        bool "SGI Ultraviolet"
     + +        depends on X86_64
     + +        depends on X86_EXTENDED_PLATFORM
 +   + +        select X86_X2APIC
     + +        ---help---
     + +          This option is needed in order to support SGI Ultraviolet systems.
     + +          If you don't have one of these, you should say N here.
     + +
     + +# Following is an alphabetically sorted list of 32 bit extended platforms
     + +# Please maintain the alphabetic order if and when there are additions
        
        config X86_ELAN
                bool "AMD Elan"
@@@@@@@@@ -408,20 -368,33 -408,20 -383,33 -408,20 -383,16 -408,20 -381,16 +411,20 @@@@@@@@@ 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 X86_SUMMIT
     + +        bool "Summit/EXA (IBM x440)"
     + +        depends on X86_32_NON_STANDARD
     + +        ---help---
     + +          This option is needed for IBM systems that use the Summit/EXA chipset.
     + +          In particular, it is needed for the x440.
     + +
     + +config X86_ES7000
     + +        bool "Unisys ES7000 IA32 series"
     + +        depends on X86_32_NON_STANDARD && X86_BIGSMP
     + +        ---help---
     + +          Support for Unisys ES7000 systems.  Say 'Y' here if this kernel is
     + +          supposed to run on an IA32-based Unisys ES7000 system.
        
 - -    config X86_VOYAGER
 - -            bool "Voyager (NCR)"
 - -            depends on SMP && !PCI && BROKEN
 - -            depends on X86_32_NON_STANDARD
 - -            ---help---
 - -              Voyager is an MCA-based 32-way capable SMP architecture proprietary
 - -              to NCR Corp.  Machine classes 345x/35xx/4100/51xx are Voyager-based.
 - -    
 - -              *** WARNING ***
 - -    
 - -              If you do not specifically know you have a Voyager based machine,
 - -              say N here, otherwise the kernel you build will not be bootable.
 - -    
        config SCHED_OMIT_FRAME_POINTER
                def_bool y
                prompt "Single-depth WCHAN output"
@@@@@@@@@ -1821,17 -1794,17 -1821,17 -1809,17 -1821,17 -1804,6 -1821,17 -1802,17 +1824,17 @@@@@@@@@ config DMA
                  and include PCI device scope covered by these DMA
                  remapping devices.
        
----  -         def_bool n
     +  config DMAR_DEFAULT_ON
++++ ++         def_bool y
     +          prompt "Enable DMA Remapping Devices by default"
     +          depends on DMAR
     +          help
     +            Selecting this option will enable a DMAR device at boot time if
     +            one is found. If this option is not selected, DMAR support can
     +            be enabled by passing intel_iommu=on to the kernel. It is
     +            recommended you say N here while the DMAR code remains
     +            experimental.
     +  
        config DMAR_GFX_WA
                def_bool y
                prompt "Support for Graphics workaround"
@@@@@@@@@ -1855,11 -1828,10 -1855,11 -1843,11 -1855,11 -1827,10 -1855,11 -1836,10 +1858,11 @@@@@@@@@ config DMAR_FLOPPY_W
        config INTR_REMAP
                bool "Support for Interrupt Remapping (EXPERIMENTAL)"
                depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI && EXPERIMENTAL
     - -        help
     - -         Supports Interrupt remapping for IO-APIC and MSI devices.
     - -         To use x2apic mode in the CPU's which support x2APIC enhancements or
     - -         to support platforms with CPU's having > 8 bit APIC ID, say Y.
 +   + +        select X86_X2APIC
     + +        ---help---
     + +          Supports Interrupt remapping for IO-APIC and MSI devices.
     + +          To use x2apic mode in the CPU's which support x2APIC enhancements or
     + +          to support platforms with CPU's having > 8 bit APIC ID, say Y.
        
        source "drivers/pci/pcie/Kconfig"
        

diff --cc arch/x86/kernel/ptrace.c
Simple merge

diff --cc arch/x86/mm/init_64.c
Simple merge

diff --cc arch/x86/mm/numa_32.c
Simple merge

diff --cc arch/x86/mm/pgtable_32.c
Simple merge

diff --cc drivers/input/mouse/Kconfig
Simple merge

diff --cc init/Kconfig
Simple merge