- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh.

[linux-flexiantxendom0-3.2.10.git] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index b3eda44..a8bed1f 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -87,9 +87,6 @@ config GENERIC_TIME_VSYSCALL
        bool
        default y
 
-config HAVE_LEGACY_PER_CPU_AREA
-       def_bool y
-
 config HAVE_SETUP_PER_CPU_AREA
        def_bool y
 
@@ -231,7 +228,7 @@ config IA64_HP_SIM
 config IA64_XEN_GUEST
        bool "Xen guest"
        select SWIOTLB
-       depends on PARAVIRT_XEN
+       depends on XEN
        help
          Build a kernel that runs on Xen guest domain. At this moment only
          16KB page size in supported.
@@ -531,6 +528,14 @@ config IA64_CPE_MIGRATE
          build this functionality as a kernel loadable module.  Installing
          the module will turn on the functionality.
 
+config PERFMON
+       bool "Performance monitor support"
+       help
+         Selects whether support for the IA-64 performance monitor hardware
+         is included in the kernel.  This makes some kernel data-structures a
+         little bigger and slows down execution a bit, but it is generally
+         a good idea to turn this on.  If you're unsure, say Y.
+
 config IA64_PALINFO
        tristate "/proc/pal support"
        help
@@ -603,8 +608,6 @@ source "drivers/firmware/Kconfig"
 
 source "fs/Kconfig.binfmt"
 
-source "arch/ia64/perfmon/Kconfig"
-
 endmenu
 
 menu "Power management and ACPI options"