1 files changed, 19 insertions, 0 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 8c39913d1729..59b91ac861ac 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -54,6 +54,11 @@ config ARCH_HAS_ILOG2_U64
         bool
         default n
 
+config HUGETLB_PAGE_SIZE_VARIABLE
+        bool
+        depends on HUGETLB_PAGE
+        default y
+
 config GENERIC_FIND_NEXT_BIT
         bool
         default y
@@ -300,6 +305,9 @@ config HOTPLUG_CPU
 config ARCH_ENABLE_MEMORY_HOTPLUG
         def_bool y
 
+config ARCH_ENABLE_MEMORY_HOTREMOVE
+        def_bool y
+
 config SCHED_SMT
         bool "SMT scheduler support"
         depends on SMP
@@ -348,6 +356,7 @@ config ARCH_FLATMEM_ENABLE
 config ARCH_SPARSEMEM_ENABLE
         def_bool y
         depends on ARCH_DISCONTIGMEM_ENABLE
+        select SPARSEMEM_VMEMMAP_ENABLE
 
 config ARCH_DISCONTIGMEM_DEFAULT
         def_bool y if (IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB)
@@ -461,6 +470,16 @@ config IA64_ESI
           firmware extensions, such as the ability to inject memory-errors
           for test-purposes.  If you're unsure, say N.
 
+config IA64_HP_AML_NFW
+        bool "Support ACPI AML calls to native firmware"
+        help
+          This driver installs a global ACPI Operation Region handler for
+          region 0xA1.  AML methods can use this OpRegion to call arbitrary
+          native firmware functions.  The driver installs the OpRegion
+          handler if there is an HPQ5001 device or if the user supplies
+          the "force" module parameter, e.g., with the "aml_nfw.force"
+          kernel command line option.
+
 source "drivers/sn/Kconfig"
 
 config KEXEC