string: factorize skip_spaces and export it to be generally available

[safe/jmp/linux-2.6] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e25b635..3b2a5ac 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -24,18 +24,21 @@ config X86
        select HAVE_UNSTABLE_SCHED_CLOCK
        select HAVE_IDE
        select HAVE_OPROFILE
        select HAVE_UNSTABLE_SCHED_CLOCK
        select HAVE_IDE
        select HAVE_OPROFILE

+       select HAVE_PERF_EVENTS if (!M386 && !M486)

        select HAVE_IOREMAP_PROT
        select HAVE_KPROBES
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARCH_WANT_FRAME_POINTERS
        select HAVE_IOREMAP_PROT
        select HAVE_KPROBES
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARCH_WANT_FRAME_POINTERS

+       select HAVE_DMA_ATTRS

        select HAVE_KRETPROBES
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_DYNAMIC_FTRACE
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_KRETPROBES
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_DYNAMIC_FTRACE
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_GRAPH_TRACER

+       select HAVE_FUNCTION_GRAPH_FP_TEST

        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
        select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
        select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE

-       select HAVE_FTRACE_SYSCALLS
+       select HAVE_SYSCALL_TRACEPOINTS

        select HAVE_KVM
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK
        select HAVE_KVM
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK


@@ -46,6 +49,14 @@ config X86
        select HAVE_KERNEL_GZIP
        select HAVE_KERNEL_BZIP2
        select HAVE_KERNEL_LZMA
        select HAVE_KERNEL_GZIP
        select HAVE_KERNEL_BZIP2
        select HAVE_KERNEL_LZMA

+       select HAVE_HW_BREAKPOINT
+       select HAVE_ARCH_KMEMCHECK
+       select HAVE_USER_RETURN_NOTIFIER
+
+config OUTPUT_FORMAT
+       string
+       default "elf32-i386" if X86_32
+       default "elf64-x86-64" if X86_64

 
 config ARCH_DEFCONFIG
        string
 
 config ARCH_DEFCONFIG
        string


@@ -77,10 +88,6 @@ config STACKTRACE_SUPPORT
 config HAVE_LATENCYTOP_SUPPORT
        def_bool y
 
 config HAVE_LATENCYTOP_SUPPORT
        def_bool y
 

-config FAST_CMPXCHG_LOCAL
-       bool
-       default y
-

 config MMU
        def_bool y
 
 config MMU
        def_bool y
 


@@ -141,7 +148,10 @@ config ARCH_HAS_CACHE_LINE_SIZE
 config HAVE_SETUP_PER_CPU_AREA
        def_bool y
 
 config HAVE_SETUP_PER_CPU_AREA
        def_bool y
 

-config HAVE_DYNAMIC_PER_CPU_AREA
+config NEED_PER_CPU_EMBED_FIRST_CHUNK
+       def_bool y
+
+config NEED_PER_CPU_PAGE_FIRST_CHUNK

        def_bool y
 
 config HAVE_CPUMASK_OF_CPU_MAP
        def_bool y
 
 config HAVE_CPUMASK_OF_CPU_MAP


@@ -170,6 +180,10 @@ config ARCH_SUPPORTS_OPTIMIZED_INLINING
 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
        def_bool y
 
 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
        def_bool y
 

+config HAVE_INTEL_TXT
+       def_bool y
+       depends on EXPERIMENTAL && DMAR && ACPI
+

 # Use the generic interrupt handling code in kernel/irq/:
 config GENERIC_HARDIRQS
        bool
 # Use the generic interrupt handling code in kernel/irq/:
 config GENERIC_HARDIRQS
        bool


@@ -274,15 +288,9 @@ config SPARSE_IRQ
 
          If you don't know what to do here, say N.
 
 
          If you don't know what to do here, say N.
 

-config NUMA_MIGRATE_IRQ_DESC
-       bool "Move irq desc when changing irq smp_affinity"
+config NUMA_IRQ_DESC
+       def_bool y

        depends on SPARSE_IRQ && NUMA
        depends on SPARSE_IRQ && NUMA

-       depends on BROKEN
-       default n
-       ---help---
-         This enables moving irq_desc to cpu/node that irq will use handled.
-
-         If you don't know what to do here, say N.

 
 config X86_MPPARSE
        bool "Enable MPS table" if ACPI
 
 config X86_MPPARSE
        bool "Enable MPS table" if ACPI


@@ -315,6 +323,7 @@ config X86_EXTENDED_PLATFORM
                SGI 320/540 (Visual Workstation)
                Summit/EXA (IBM x440)
                Unisys ES7000 IA32 series
                SGI 320/540 (Visual Workstation)
                Summit/EXA (IBM x440)
                Unisys ES7000 IA32 series

+               Moorestown MID devices

 
          If you have one of these systems, or if you want to build a
          generic distribution kernel, say Y here - otherwise say N.
 
          If you have one of these systems, or if you want to build a
          generic distribution kernel, say Y here - otherwise say N.


@@ -355,7 +364,7 @@ config X86_UV
        depends on X86_64
        depends on X86_EXTENDED_PLATFORM
        depends on NUMA
        depends on X86_64
        depends on X86_EXTENDED_PLATFORM
        depends on NUMA

-       select X86_X2APIC
+       depends on 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.
        ---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.


@@ -374,6 +383,18 @@ config X86_ELAN
 
          If unsure, choose "PC-compatible" instead.
 
 
          If unsure, choose "PC-compatible" instead.
 

+config X86_MRST
+       bool "Moorestown MID platform"
+       depends on X86_32
+       depends on X86_EXTENDED_PLATFORM
+       ---help---
+         Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin
+         Internet Device(MID) platform. Moorestown consists of two chips:
+         Lincroft (CPU core, graphics, and memory controller) and Langwell IOH.
+         Unlike standard x86 PCs, Moorestown does not have many legacy devices
+         nor standard legacy replacement devices/features. e.g. Moorestown does
+         not contain i8259, i8254, HPET, legacy BIOS, most of the io ports.
+

 config X86_RDC321X
        bool "RDC R-321x SoC"
        depends on X86_32
 config X86_RDC321X
        bool "RDC R-321x SoC"
        depends on X86_32


@@ -409,6 +430,17 @@ config X86_NUMAQ
          of Flat Logical.  You will need a new lynxer.elf file to flash your
          firmware with - send email to <Martin.Bligh@us.ibm.com>.
 
          of Flat Logical.  You will need a new lynxer.elf file to flash your
          firmware with - send email to <Martin.Bligh@us.ibm.com>.
 

+config X86_SUPPORTS_MEMORY_FAILURE
+       bool
+       # MCE code calls memory_failure():
+       depends on X86_MCE
+       # On 32-bit this adds too big of NODES_SHIFT and we run out of page flags:
+       depends on !X86_NUMAQ
+       # On 32-bit SPARSEMEM adds too big of SECTIONS_WIDTH:
+       depends on X86_64 || !SPARSEMEM
+       select ARCH_SUPPORTS_MEMORY_FAILURE
+       default y
+

 config X86_VISWS
        bool "SGI 320/540 (Visual Workstation)"
        depends on X86_32 && PCI && X86_MPPARSE && PCI_GODIRECT
 config X86_VISWS
        bool "SGI 320/540 (Visual Workstation)"
        depends on X86_32 && PCI && X86_MPPARSE && PCI_GODIRECT


@@ -461,7 +493,7 @@ if PARAVIRT_GUEST
 source "arch/x86/xen/Kconfig"
 
 config VMI
 source "arch/x86/xen/Kconfig"
 
 config VMI

-       bool "VMI Guest support"
+       bool "VMI Guest support (DEPRECATED)"

        select PARAVIRT
        depends on X86_32
        ---help---
        select PARAVIRT
        depends on X86_32
        ---help---


@@ -470,6 +502,15 @@ config VMI
          at the moment), by linking the kernel to a GPL-ed ROM module
          provided by the hypervisor.
 
          at the moment), by linking the kernel to a GPL-ed ROM module
          provided by the hypervisor.
 

+         As of September 2009, VMware has started a phased retirement
+         of this feature from VMware's products. Please see
+         feature-removal-schedule.txt for details.  If you are
+         planning to enable this option, please note that you cannot
+         live migrate a VMI enabled VM to a future VMware product,
+         which doesn't support VMI. So if you expect your kernel to
+         seamlessly migrate to newer VMware products, keep this
+         disabled.
+

 config KVM_CLOCK
        bool "KVM paravirtualized clock"
        select PARAVIRT
 config KVM_CLOCK
        bool "KVM paravirtualized clock"
        select PARAVIRT


@@ -583,7 +624,6 @@ config GART_IOMMU
        bool "GART IOMMU support" if EMBEDDED
        default y
        select SWIOTLB
        bool "GART IOMMU support" if EMBEDDED
        default y
        select SWIOTLB

-       select AGP

        depends on X86_64 && PCI
        ---help---
          Support for full DMA access of devices with 32bit memory access only
        depends on X86_64 && PCI
        ---help---
          Support for full DMA access of devices with 32bit memory access only


@@ -774,41 +814,17 @@ config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
          increased on these systems.
 
 config X86_MCE
          increased on these systems.
 
 config X86_MCE

-       bool "Machine Check Exception"
+       bool "Machine Check / overheating reporting"

        ---help---
        ---help---

-         Machine Check Exception support allows the processor to notify the
-         kernel if it detects a problem (e.g. overheating, component failure).
+         Machine Check support allows the processor to notify the
+         kernel if it detects a problem (e.g. overheating, data corruption).

          The action the kernel takes depends on the severity of the problem,
          The action the kernel takes depends on the severity of the problem,

-         ranging from a warning message on the console, to halting the machine.
-         Your processor must be a Pentium or newer to support this - check the
-         flags in /proc/cpuinfo for mce.  Note that some older Pentium systems
-         have a design flaw which leads to false MCE events - hence MCE is
-         disabled on all P5 processors, unless explicitly enabled with "mce"
-         as a boot argument.  Similarly, if MCE is built in and creates a
-         problem on some new non-standard machine, you can boot with "nomce"
-         to disable it.  MCE support simply ignores non-MCE processors like
-         the 386 and 486, so nearly everyone can say Y here.
-
-config X86_OLD_MCE
-       depends on X86_32 && X86_MCE
-       bool "Use legacy machine check code (will go away)"
-       default n
-       select X86_ANCIENT_MCE
-       ---help---
-         Use the old i386 machine check code. This is merely intended for
-         testing in a transition period. Try this if you run into any machine
-         check related software problems, but report the problem to
-         linux-kernel.  When in doubt say no.
-
-config X86_NEW_MCE
-       depends on X86_MCE
-       bool
-       default y if (!X86_OLD_MCE && X86_32) || X86_64
+         ranging from warning messages to halting the machine.

 
 config X86_MCE_INTEL
        def_bool y
        prompt "Intel MCE features"
 
 config X86_MCE_INTEL
        def_bool y
        prompt "Intel MCE features"

-       depends on X86_NEW_MCE && X86_LOCAL_APIC
+       depends on X86_MCE && X86_LOCAL_APIC

        ---help---
           Additional support for intel specific MCE features such as
           the thermal monitor.
        ---help---
           Additional support for intel specific MCE features such as
           the thermal monitor.


@@ -816,19 +832,19 @@ config X86_MCE_INTEL
 config X86_MCE_AMD
        def_bool y
        prompt "AMD MCE features"
 config X86_MCE_AMD
        def_bool y
        prompt "AMD MCE features"

-       depends on X86_NEW_MCE && X86_LOCAL_APIC
+       depends on X86_MCE && X86_LOCAL_APIC

        ---help---
           Additional support for AMD specific MCE features such as
           the DRAM Error Threshold.
 
 config X86_ANCIENT_MCE
        ---help---
           Additional support for AMD specific MCE features such as
           the DRAM Error Threshold.
 
 config X86_ANCIENT_MCE

-       def_bool n
-       depends on X86_32
-       prompt "Support for old Pentium 5 / WinChip machine checks"
-       ---help---
-        Include support for machine check handling on old Pentium 5 or WinChip
-        systems. These typically need to be enabled explicitely on the command
-        line.
+       def_bool n
+       depends on X86_32 && X86_MCE
+       prompt "Support for old Pentium 5 / WinChip machine checks"
+       ---help---
+         Include support for machine check handling on old Pentium 5 or WinChip
+         systems. These typically need to be enabled explicitely on the command
+         line.

 
 config X86_MCE_THRESHOLD
        depends on X86_MCE_AMD || X86_MCE_INTEL
 
 config X86_MCE_THRESHOLD
        depends on X86_MCE_AMD || X86_MCE_INTEL


@@ -836,36 +852,16 @@ config X86_MCE_THRESHOLD
        default y
 
 config X86_MCE_INJECT
        default y
 
 config X86_MCE_INJECT

-       depends on X86_NEW_MCE
+       depends on X86_MCE

        tristate "Machine check injector support"
        ---help---
          Provide support for injecting machine checks for testing purposes.
          If you don't know what a machine check is and you don't do kernel
          QA it is safe to say n.
 
        tristate "Machine check injector support"
        ---help---
          Provide support for injecting machine checks for testing purposes.
          If you don't know what a machine check is and you don't do kernel
          QA it is safe to say n.
 

-config X86_MCE_NONFATAL
-       tristate "Check for non-fatal errors on AMD Athlon/Duron / Intel Pentium 4"
-       depends on X86_OLD_MCE
-       ---help---
-         Enabling this feature starts a timer that triggers every 5 seconds which
-         will look at the machine check registers to see if anything happened.
-         Non-fatal problems automatically get corrected (but still logged).
-         Disable this if you don't want to see these messages.
-         Seeing the messages this option prints out may be indicative of dying
-         or out-of-spec (ie, overclocked) hardware.
-         This option only does something on certain CPUs.
-         (AMD Athlon/Duron and Intel Pentium 4)
-
-config X86_MCE_P4THERMAL
-       bool "check for P4 thermal throttling interrupt."
-       depends on X86_OLD_MCE && X86_MCE && (X86_UP_APIC || SMP)
-       ---help---
-         Enabling this feature will cause a message to be printed when the P4
-         enters thermal throttling.
-

 config X86_THERMAL_VECTOR
        def_bool y
 config X86_THERMAL_VECTOR
        def_bool y

-       depends on X86_MCE_P4THERMAL || X86_MCE_INTEL
+       depends on X86_MCE_INTEL

 
 config VM86
        bool "Enable VM86 support" if EMBEDDED
 
 config VM86
        bool "Enable VM86 support" if EMBEDDED


@@ -1226,6 +1222,10 @@ config ARCH_DISCONTIGMEM_DEFAULT
        def_bool y
        depends on NUMA && X86_32
 
        def_bool y
        depends on NUMA && X86_32
 

+config ARCH_PROC_KCORE_TEXT
+       def_bool y
+       depends on X86_64 && PROC_KCORE
+

 config ARCH_SPARSEMEM_DEFAULT
        def_bool y
        depends on X86_64
 config ARCH_SPARSEMEM_DEFAULT
        def_bool y
        depends on X86_64


@@ -1332,7 +1332,9 @@ config MATH_EMULATION
          kernel, it won't hurt.
 
 config MTRR
          kernel, it won't hurt.
 
 config MTRR

-       bool "MTRR (Memory Type Range Register) support"
+       bool
+       default y
+       prompt "MTRR (Memory Type Range Register) support" if EMBEDDED

        ---help---
          On Intel P6 family processors (Pentium Pro, Pentium II and later)
          the Memory Type Range Registers (MTRRs) may be used to control
        ---help---
          On Intel P6 family processors (Pentium Pro, Pentium II and later)
          the Memory Type Range Registers (MTRRs) may be used to control


@@ -1398,7 +1400,8 @@ config MTRR_SANITIZER_SPARE_REG_NR_DEFAULT
 
 config X86_PAT
        bool
 
 config X86_PAT
        bool

-       prompt "x86 PAT support"
+       default y
+       prompt "x86 PAT support" if EMBEDDED

        depends on MTRR
        ---help---
          Use PAT attributes to setup page level cache control.
        depends on MTRR
        ---help---
          Use PAT attributes to setup page level cache control.


@@ -1411,6 +1414,10 @@ config X86_PAT
 
          If unsure, say Y.
 
 
          If unsure, say Y.
 

+config ARCH_USES_PG_UNCACHED
+       def_bool y
+       depends on X86_PAT
+

 config EFI
        bool "EFI runtime service support"
        depends on ACPI
 config EFI
        bool "EFI runtime service support"
        depends on ACPI


@@ -1441,12 +1448,8 @@ config SECCOMP
 
          If unsure, say Y. Only embedded should say N here.
 
 
          If unsure, say Y. Only embedded should say N here.
 

-config CC_STACKPROTECTOR_ALL
-       bool
-

 config CC_STACKPROTECTOR
        bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
 config CC_STACKPROTECTOR
        bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"

-       select CC_STACKPROTECTOR_ALL

        ---help---
          This option turns on the -fstack-protector GCC feature. This
          feature puts, at the beginning of functions, a canary value on
        ---help---
          This option turns on the -fstack-protector GCC feature. This
          feature puts, at the beginning of functions, a canary value on


@@ -1503,9 +1506,7 @@ config KEXEC_JUMP
 
 config PHYSICAL_START
        hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
 
 config PHYSICAL_START
        hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)

-       default "0x1000000" if X86_NUMAQ
-       default "0x200000" if X86_64
-       default "0x100000"
+       default "0x1000000"

        ---help---
          This gives the physical address where the kernel is loaded.
 
        ---help---
          This gives the physical address where the kernel is loaded.
 


@@ -1524,15 +1525,15 @@ config PHYSICAL_START
          to be specifically compiled to run from a specific memory area
          (normally a reserved region) and this option comes handy.
 
          to be specifically compiled to run from a specific memory area
          (normally a reserved region) and this option comes handy.
 

-         So if you are using bzImage for capturing the crash dump, leave
-         the value here unchanged to 0x100000 and set CONFIG_RELOCATABLE=y.
-         Otherwise if you plan to use vmlinux for capturing the crash dump
-         change this value to start of the reserved region (Typically 16MB
-         0x1000000). In other words, it can be set based on the "X" value as
-         specified in the "crashkernel=YM@XM" command line boot parameter
-         passed to the panic-ed kernel. Typically this parameter is set as
-         crashkernel=64M@16M. Please take a look at
-         Documentation/kdump/kdump.txt for more details about crash dumps.
+         So if you are using bzImage for capturing the crash dump,
+         leave the value here unchanged to 0x1000000 and set
+         CONFIG_RELOCATABLE=y.  Otherwise if you plan to use vmlinux
+         for capturing the crash dump change this value to start of
+         the reserved region.  In other words, it can be set based on
+         the "X" value as specified in the "crashkernel=YM@XM"
+         command line boot parameter passed to the panic-ed
+         kernel. Please take a look at Documentation/kdump/kdump.txt
+         for more details about crash dumps.

 
          Usage of bzImage for capturing the crash dump is recommended as
          one does not have to build two kernels. Same kernel can be used
 
          Usage of bzImage for capturing the crash dump is recommended as
          one does not have to build two kernels. Same kernel can be used


@@ -1545,8 +1546,8 @@ config PHYSICAL_START
          Don't change this unless you know what you are doing.
 
 config RELOCATABLE
          Don't change this unless you know what you are doing.
 
 config RELOCATABLE

-       bool "Build a relocatable kernel (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       bool "Build a relocatable kernel"
+       default y

        ---help---
          This builds a kernel image that retains relocation information
          so it can be loaded someplace besides the default 1MB.
        ---help---
          This builds a kernel image that retains relocation information
          so it can be loaded someplace besides the default 1MB.


@@ -1561,12 +1562,16 @@ config RELOCATABLE
          it has been loaded at and the compile time physical address
          (CONFIG_PHYSICAL_START) is ignored.
 
          it has been loaded at and the compile time physical address
          (CONFIG_PHYSICAL_START) is ignored.
 

+# Relocation on x86-32 needs some additional build support
+config X86_NEED_RELOCS
+       def_bool y
+       depends on X86_32 && RELOCATABLE
+

 config PHYSICAL_ALIGN
        hex
        prompt "Alignment value to which kernel should be aligned" if X86_32
 config PHYSICAL_ALIGN
        hex
        prompt "Alignment value to which kernel should be aligned" if X86_32

-       default "0x100000" if X86_32
-       default "0x200000" if X86_64
-       range 0x2000 0x400000
+       default "0x1000000"
+       range 0x2000 0x1000000

        ---help---
          This value puts the alignment restrictions on physical address
          where kernel is loaded and run from. Kernel is compiled for an
        ---help---
          This value puts the alignment restrictions on physical address
          where kernel is loaded and run from. Kernel is compiled for an


@@ -1602,7 +1607,7 @@ config COMPAT_VDSO
        depends on X86_32 || IA32_EMULATION
        ---help---
          Map the 32-bit VDSO to the predictable old-style address too.
        depends on X86_32 || IA32_EMULATION
        ---help---
          Map the 32-bit VDSO to the predictable old-style address too.

-       ---help---
+

          Say N here if you are running a sufficiently recent glibc
          version (2.3.3 or later), to remove the high-mapped
          VDSO mapping and to exclusively use the randomized VDSO.
          Say N here if you are running a sufficiently recent glibc
          version (2.3.3 or later), to remove the high-mapped
          VDSO mapping and to exclusively use the randomized VDSO.


@@ -1678,6 +1683,8 @@ source "kernel/power/Kconfig"
 
 source "drivers/acpi/Kconfig"
 
 
 source "drivers/acpi/Kconfig"
 

+source "drivers/sfi/Kconfig"
+

 config X86_APM_BOOT
        bool
        default y
 config X86_APM_BOOT
        bool
        default y


@@ -1873,7 +1880,7 @@ config PCI_DIRECT
 
 config PCI_MMCONFIG
        def_bool y
 
 config PCI_MMCONFIG
        def_bool y

-       depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
+       depends on X86_32 && PCI && (ACPI || SFI) && (PCI_GOMMCONFIG || PCI_GOANY)

 
 config PCI_OLPC
        def_bool y
 
 config PCI_OLPC
        def_bool y


@@ -1908,25 +1915,26 @@ config DMAR_DEFAULT_ON
          recommended you say N here while the DMAR code remains
          experimental.
 
          recommended you say N here while the DMAR code remains
          experimental.
 

-config DMAR_GFX_WA
-       def_bool y
-       prompt "Support for Graphics workaround"
-       depends on DMAR
+config DMAR_BROKEN_GFX_WA
+       def_bool n
+       prompt "Workaround broken graphics drivers (going away soon)"
+       depends on DMAR && BROKEN

        ---help---
          Current Graphics drivers tend to use physical address
          for DMA and avoid using DMA APIs. Setting this config
          option permits the IOMMU driver to set a unity map for
          all the OS-visible memory. Hence the driver can continue
        ---help---
          Current Graphics drivers tend to use physical address
          for DMA and avoid using DMA APIs. Setting this config
          option permits the IOMMU driver to set a unity map for
          all the OS-visible memory. Hence the driver can continue

-         to use physical addresses for DMA.
+         to use physical addresses for DMA, at least until this
+         option is removed in the 2.6.32 kernel.

 
 config DMAR_FLOPPY_WA
        def_bool y
        depends on DMAR
        ---help---
 
 config DMAR_FLOPPY_WA
        def_bool y
        depends on DMAR
        ---help---

-         Floppy disk drivers are know to bypass DMA API calls
+         Floppy disk drivers are known to bypass DMA API calls

          thereby failing to work when IOMMU is enabled. This
          workaround will setup a 1:1 mapping for the first
          thereby failing to work when IOMMU is enabled. This
          workaround will setup a 1:1 mapping for the first

-         16M to make floppy (an ISA device) work.
+         16MiB to make floppy (an ISA device) work.

 
 config INTR_REMAP
        bool "Support for Interrupt Remapping (EXPERIMENTAL)"
 
 config INTR_REMAP
        bool "Support for Interrupt Remapping (EXPERIMENTAL)"


@@ -2004,18 +2012,9 @@ config SCx200HR_TIMER
          processor goes idle (as is done by the scheduler).  The
          other workaround is idle=poll boot option.
 
          processor goes idle (as is done by the scheduler).  The
          other workaround is idle=poll boot option.
 

-config GEODE_MFGPT_TIMER
-       def_bool y
-       prompt "Geode Multi-Function General Purpose Timer (MFGPT) events"
-       depends on MGEODE_LX && GENERIC_TIME && GENERIC_CLOCKEVENTS
-       ---help---
-         This driver provides a clock event source based on the MFGPT
-         timer(s) in the CS5535 and CS5536 companion chip for the geode.
-         MFGPTs have a better resolution and max interval than the
-         generic PIT, and are suitable for use as high-res timers.
-

 config OLPC
        bool "One Laptop Per Child support"
 config OLPC
        bool "One Laptop Per Child support"

+       select GPIOLIB

        default n
        ---help---
          Add support for detecting the unique features of the OLPC
        default n
        ---help---
          Add support for detecting the unique features of the OLPC