Pull esi-support into release branch

diff --combined arch/ia64/Kconfig
index db274da,bc10651..9ed69e7
--- 1/arch/ia64/Kconfig
--- 2/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@@ -70,15 -70,6 +70,15 @@@ config DMA_IS_DMA3
        bool
        default y
  
 +config DMA_IS_NORMAL
 +      bool
 +      depends on IA64_SGI_SN2
 +      default y
 +
 +config AUDIT_ARCH
 +      bool
 +      default y
 +
  choice
        prompt "System type"
        default IA64_GENERIC
@@@ -86,7 -77,6 +86,7 @@@
  config IA64_GENERIC
        bool "generic"
        select ACPI
 +      select PCI
        select NUMA
        select ACPI_NUMA
        help
@@@ -262,7 -252,7 +262,7 @@@ config NR_CPU
        int "Maximum number of CPUs (2-1024)"
        range 2 1024
        depends on SMP
 -      default "64"
 +      default "1024"
        help
          You should set this to the number of CPUs in your system, but
          keep in mind that a kernel compiled for, e.g., 2 CPUs will boot but
@@@ -280,12 -270,10 +280,12 @@@ config HOTPLUG_CP
          can be controlled through /sys/devices/system/cpu/cpu#.
          Say N if you want to disable CPU hotplug.
  
 +config ARCH_ENABLE_MEMORY_HOTPLUG
 +      def_bool y
 +
  config SCHED_SMT
        bool "SMT scheduler support"
        depends on SMP
 -      default off
        help
          Improves the CPU scheduler's decision making when dealing with
          Intel IA64 chips with MultiThreading at a cost of slightly increased
@@@ -358,7 -346,7 +358,7 @@@ config NUM
  config NODES_SHIFT
        int "Max num nodes shift(3-10)"
        range 3 10
 -      default "8"
 +      default "10"
        depends on NEED_MULTIPLE_NODES
        help
          This option specifies the maximum number of nodes in your SSI system.
@@@ -386,10 -374,6 +386,10 @@@ config HAVE_ARCH_EARLY_PFN_TO_NI
        def_bool y
        depends on NEED_MULTIPLE_NODES
  
 +config HAVE_ARCH_NODEDATA_EXTENSION
 +      def_bool y
 +      depends on NUMA
 +
  config IA32_SUPPORT
        bool "Support for Linux/x86 binaries"
        help
@@@ -429,6 -413,14 +429,14 @@@ config IA64_PALINF
  config SGI_SN
        def_bool y if (IA64_SGI_SN2 || IA64_GENERIC)
  
+ config IA64_ESI
+       bool "ESI (Extensible SAL Interface) support"
+       help
+         If you say Y here, support is built into the kernel to
+         make ESI calls.  ESI calls are used to support vendor-specific
+         firmware extensions, such as the ability to inject memory-errors
+         for test-purposes.  If you're unsure, say N.
+ 
  source "drivers/sn/Kconfig"
  
  source "drivers/firmware/Kconfig"
@@@ -465,8 -457,6 +473,8 @@@ config PCI_DOMAIN
        bool
        default PCI
  
 +source "drivers/pci/pcie/Kconfig"
 +
  source "drivers/pci/Kconfig"
  
  source "drivers/pci/hotplug/Kconfig"
@@@ -501,10 -491,6 +509,10 @@@ config GENERIC_PENDING_IR
        depends on GENERIC_HARDIRQS && SMP
        default y
  
 +config IRQ_PER_CPU
 +      bool
 +      default y
 +
  source "arch/ia64/hp/sim/Kconfig"
  
  menu "Instrumentation Support"

diff --combined arch/ia64/kernel/Makefile
index ad8215a,66ac8e3..3149749
--- 1/arch/ia64/kernel/Makefile
--- 2/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@@ -29,9 -29,13 +29,14 @@@ obj-$(CONFIG_CPU_FREQ)              += cpufreq
  obj-$(CONFIG_IA64_MCA_RECOVERY)       += mca_recovery.o
  obj-$(CONFIG_KPROBES)         += kprobes.o jprobes.o
  obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o
 +obj-$(CONFIG_AUDIT)           += audit.o
  mca_recovery-y                        += mca_drv.o mca_drv_asm.o
  
+ obj-$(CONFIG_IA64_ESI)                += esi.o
+ ifneq ($(CONFIG_IA64_ESI),)
+ obj-y                         += esi_stub.o   # must be in kernel proper
+ endif
+ 
  # The gate DSO image is built using a special linker script.
  targets += gate.so gate-syms.o
  
@@@ -45,8 -49,7 +50,8 @@@ CPPFLAGS_gate.lds := -P -C -U$(ARCH
  quiet_cmd_gate = GATE $@
        cmd_gate = $(CC) -nostdlib $(GATECFLAGS_$(@F)) -Wl,-T,$(filter-out FORCE,$^) -o $@
  
 -GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1
 +GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1 \
 +                   $(call ld-option, -Wl$(comma)--hash-style=sysv)
  $(obj)/gate.so: $(obj)/gate.lds $(obj)/gate.o FORCE
        $(call if_changed,gate)
  

diff --combined arch/ia64/kernel/ia64_ksyms.c
index 3ead20f,9583f31..879c181
--- 1/arch/ia64/kernel/ia64_ksyms.c
--- 2/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
@@@ -5,6 -5,7 +5,6 @@@
   * All other exports should be put directly after the definition.
   */
  
 -#include <linux/config.h>
  #include <linux/module.h>
  
  #include <linux/string.h>
@@@ -62,7 -63,7 +62,7 @@@ EXPORT_SYMBOL(__udivdi3)
  EXPORT_SYMBOL(__moddi3);
  EXPORT_SYMBOL(__umoddi3);
  
 -#if defined(CONFIG_MD_RAID5) || defined(CONFIG_MD_RAID5_MODULE)
 +#if defined(CONFIG_MD_RAID456) || defined(CONFIG_MD_RAID456_MODULE)
  extern void xor_ia64_2(void);
  extern void xor_ia64_3(void);
  extern void xor_ia64_4(void);
@@@ -105,5 -106,9 +105,9 @@@ EXPORT_SYMBOL(ia64_spinlock_contention)
  # endif
  #endif
  
+ #if defined(CONFIG_IA64_ESI) || defined(CONFIG_IA64_ESI_MODULE)
+ extern void esi_call_phys (void);
+ EXPORT_SYMBOL_GPL(esi_call_phys);
+ #endif
  extern char ia64_ivt[];
  EXPORT_SYMBOL(ia64_ivt);