Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / arch / x86_64 / Kconfig

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 37f11f24a0457619d3c9be24d2fd3b38cc50dd5f..78cb68f2ebbd7653c3b9d9395369fff7904e5761 100644 (file)
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -175,14 +175,12 @@ config MK8
 config MPSC
        bool "Intel P4 / older Netburst based Xeon"
        help
 config MPSC
        bool "Intel P4 / older Netburst based Xeon"
        help

-         Optimize for Intel Pentium 4 and older Nocona/Dempsey Xeon CPUs
-         with Intel Extended Memory 64 Technology(EM64T). For details see
-         <http://www.intel.com/technology/64bitextensions/>.
+         Optimize for Intel Pentium 4, Pentium D and older Nocona/Dempsey
+         Xeon CPUs with Intel 64bit which is compatible with x86-64.

          Note that the latest Xeons (Xeon 51xx and 53xx) are not based on the
           Netburst core and shouldn't use this option. You can distinguish them
          using the cpu family field
          Note that the latest Xeons (Xeon 51xx and 53xx) are not based on the
           Netburst core and shouldn't use this option. You can distinguish them
          using the cpu family field

-         in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one
-         (this rule only applies to systems that support EM64T)
+         in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one.

 
 config MCORE2
        bool "Intel Core2 / newer Xeon"
 
 config MCORE2
        bool "Intel Core2 / newer Xeon"


@@ -190,8 +188,7 @@ config MCORE2
          Optimize for Intel Core2 and newer Xeons (51xx)
          You can distinguish the newer Xeons from the older ones using
          the cpu family field in /proc/cpuinfo. 15 is an older Xeon
          Optimize for Intel Core2 and newer Xeons (51xx)
          You can distinguish the newer Xeons from the older ones using
          the cpu family field in /proc/cpuinfo. 15 is an older Xeon

-         (use CONFIG_MPSC then), 6 is a newer one. This rule only
-         applies to CPUs that support EM64T.
+         (use CONFIG_MPSC then), 6 is a newer one.

 
 config GENERIC_CPU
        bool "Generic-x86-64"
 
 config GENERIC_CPU
        bool "Generic-x86-64"


@@ -476,8 +473,9 @@ config HPET_TIMER
          <http://www.intel.com/hardwaredesign/hpetspec.htm>.
 
 config HPET_EMULATE_RTC
          <http://www.intel.com/hardwaredesign/hpetspec.htm>.
 
 config HPET_EMULATE_RTC

-       bool "Provide RTC interrupt"
+       bool

        depends on HPET_TIMER && RTC=y
        depends on HPET_TIMER && RTC=y

+       default y

 
 # Mark as embedded because too many people got it wrong.
 # The code disables itself when not needed.
 
 # Mark as embedded because too many people got it wrong.
 # The code disables itself when not needed.


@@ -582,17 +580,18 @@ config CRASH_DUMP
        bool "kernel crash dumps (EXPERIMENTAL)"
        depends on EXPERIMENTAL
        help
        bool "kernel crash dumps (EXPERIMENTAL)"
        depends on EXPERIMENTAL
        help

-          Generate crash dump after being started by kexec.
-          This should be normally only set in special crash dump kernels
-          which are loaded in the main kernel with kexec-tools into
-          a specially reserved region and then later executed after
-          a crash by kdump/kexec. The crash dump kernel must be compiled
+         Generate crash dump after being started by kexec.
+         This should be normally only set in special crash dump kernels
+         which are loaded in the main kernel with kexec-tools into
+         a specially reserved region and then later executed after
+         a crash by kdump/kexec. The crash dump kernel must be compiled

          to a memory address not used by the main kernel or BIOS using
          to a memory address not used by the main kernel or BIOS using

-         PHYSICAL_START.
-          For more details see Documentation/kdump/kdump.txt
+         PHYSICAL_START, or it must be built as a relocatable image
+         (CONFIG_RELOCATABLE=y).
+         For more details see Documentation/kdump/kdump.txt

 
 config RELOCATABLE
 
 config RELOCATABLE

-       bool "Build a relocatable kernel(EXPERIMENTAL)"
+       bool "Build a relocatable kernel (EXPERIMENTAL)"

        depends on EXPERIMENTAL
        help
          Builds a relocatable kernel. This enables loading and running
        depends on EXPERIMENTAL
        help
          Builds a relocatable kernel. This enables loading and running


@@ -603,8 +602,8 @@ config RELOCATABLE
          must live at a different physical address than the primary
          kernel.
 
          must live at a different physical address than the primary
          kernel.
 

-         Note: If CONFIG_RELOCATABLE=y, then kernel run from the address
-         it has been loaded at and compile time physical address
+         Note: If CONFIG_RELOCATABLE=y, then the kernel runs from the address
+         it has been loaded at and the compile time physical address

          (CONFIG_PHYSICAL_START) is ignored.
 
 config PHYSICAL_START
          (CONFIG_PHYSICAL_START) is ignored.
 
 config PHYSICAL_START


@@ -717,6 +716,11 @@ menu "Power management options"
 
 source kernel/power/Kconfig
 
 
 source kernel/power/Kconfig
 

+config ARCH_HIBERNATION_HEADER
+       bool
+       depends on HIBERNATION
+       default y
+

 source "drivers/acpi/Kconfig"
 
 source "arch/x86/kernel/cpufreq/Kconfig"
 source "drivers/acpi/Kconfig"
 
 source "arch/x86/kernel/cpufreq/Kconfig"