JFS: Fix regression. fsck complains if symlinks do not have INLINEEA attribute

[linux-2.6] / arch / x86_64 / Kconfig

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 150e1ac0bfed9736412e4145fa8fcccb2bcf06e8..2f9deca31cc93f7ac83cae9d1c7bcb8827431ebf 100644 (file)
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -78,6 +78,24 @@ source "init/Kconfig"
 
 menu "Processor type and features"
 
 
 menu "Processor type and features"
 

+choice
+       prompt "Subarchitecture Type"
+       default X86_PC
+
+config X86_PC
+       bool "PC-compatible"
+       help
+         Choose this option if your computer is a standard PC or compatible.
+
+config X86_VSMP
+       bool "Support for ScaleMP vSMP"
+        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.
+
+endchoice
+

 choice
        prompt "Processor family"
        default MK8
 choice
        prompt "Processor family"
        default MK8


@@ -287,7 +305,11 @@ config ARCH_DISCONTIGMEM_DEFAULT
 
 config ARCH_SPARSEMEM_ENABLE
        def_bool y
 
 config ARCH_SPARSEMEM_ENABLE
        def_bool y

-       depends on NUMA
+       depends on (NUMA || EXPERIMENTAL)
+
+config ARCH_MEMORY_PROBE
+       def_bool y
+       depends on MEMORY_HOTPLUG

 
 config ARCH_FLATMEM_ENABLE
        def_bool y
 
 config ARCH_FLATMEM_ENABLE
        def_bool y


@@ -297,6 +319,7 @@ source "mm/Kconfig"
 
 config HAVE_ARCH_EARLY_PFN_TO_NID
        def_bool y
 
 config HAVE_ARCH_EARLY_PFN_TO_NID
        def_bool y

+       depends on NUMA

 
 config NR_CPUS
        int "Maximum number of CPUs (2-256)"
 
 config NR_CPUS
        int "Maximum number of CPUs (2-256)"


@@ -332,7 +355,7 @@ config HPET_TIMER
          <http://www.intel.com/hardwaredesign/hpetspec.htm>.
 
 config X86_PM_TIMER
          <http://www.intel.com/hardwaredesign/hpetspec.htm>.
 
 config X86_PM_TIMER

-       bool "PM timer"
+       bool "PM timer" if EMBEDDED

        depends on ACPI
        default y
        help
        depends on ACPI
        default y
        help


@@ -351,32 +374,24 @@ config HPET_EMULATE_RTC
        depends on HPET_TIMER && RTC=y
 
 config GART_IOMMU
        depends on HPET_TIMER && RTC=y
 
 config GART_IOMMU

-       bool "IOMMU support"
+       bool "K8 GART IOMMU support"

        default y
        default y

+       select SWIOTLB

        depends on PCI
        help
          Support the IOMMU. Needed to run systems with more than 3GB of memory
          properly with 32-bit PCI devices that do not support DAC (Double Address
          Cycle). The IOMMU can be turned off at runtime with the iommu=off parameter.
          Normally the kernel will take the right choice by itself.
        depends on PCI
        help
          Support the IOMMU. Needed to run systems with more than 3GB of memory
          properly with 32-bit PCI devices that do not support DAC (Double Address
          Cycle). The IOMMU can be turned off at runtime with the iommu=off parameter.
          Normally the kernel will take the right choice by itself.

-         This option includes a driver for the AMD Opteron/Athlon64 IOMMU
-         and a software emulation used on some other systems.
+         This option includes a driver for the AMD Opteron/Athlon64 northbridge IOMMU
+         and a software emulation used on other systems.

          If unsure, say Y.
 
 # need this always enabled with GART_IOMMU for the VIA workaround
 config SWIOTLB
          If unsure, say Y.
 
 # need this always enabled with GART_IOMMU for the VIA workaround
 config SWIOTLB

-       bool
-       depends on GART_IOMMU
-       default y
-
-config DUMMY_IOMMU

        bool
        bool

-       depends on !GART_IOMMU && !SWIOTLB

        default y
        default y

-       help
-         Don't use IOMMU code. This will cause problems when you have more than 4GB
-         of memory and any 32-bit devices. Don't turn on unless you know what you
-         are doing.
+       depends on GART_IOMMU

 
 config X86_MCE
        bool "Machine check support" if EMBEDDED
 
 config X86_MCE
        bool "Machine check support" if EMBEDDED