2.6.24

 arch

 ia64

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 8c39913..bef4772 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)
@@ -443,9 +452,9 @@ config IA64_PALINFO
 config IA64_MC_ERR_INJECT
    tristate "MC error injection support"
    help
-     Selets whether support for MC error injection. By enabling the
-     support, kernel provide sysfs interface for user application to
-     call MC error injection PAL procedure to inject various errors.
+     Adds support for MC error injection. If enabled, the kernel 
+     will provide a sysfs interface for user applications to
+     call MC error injection PAL procedures to inject various errors.
      This is a useful tool for MCA testing.
 
      If you're unsure, do not select this option.
@@ -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
@@ -472,7 +491,7 @@ config KEXEC
      but it is independent of the system firmware.   And like a reboot
      you can start any kernel with it, not just Linux.
 
-     The name comes from the similiarity to the exec system call.
+     The name comes from the similarity to the exec system call.
 
      It is an ongoing process to be certain the hardware in a machine
      is properly shutdown, so do not be surprised if this code does not
@@ -573,21 +592,7 @@ config IRQ_PER_CPU
 
 source "arch/ia64/hp/sim/Kconfig"
 
-menu "Instrumentation Support"
-        depends on EXPERIMENTAL
-
-source "arch/ia64/oprofile/Kconfig"
-
-config KPROBES
-   bool "Kprobes"
-   depends on KALLSYMS && MODULES
-   help
-     Kprobes allows you to trap at almost any kernel address and
-     execute a callback function.  register_kprobe() establishes
-     a probepoint and specifies the callback.  Kprobes is useful
-     for kernel debugging, non-intrusive instrumentation and testing.
-     If in doubt, say "N".
-endmenu
+source "kernel/Kconfig.instrumentation"
 
 source "arch/ia64/Kconfig.debug"