linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / ia64 / kernel / head.S

diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S
index dded6f2..f1778a8 100644 (file)
--- a/arch/ia64/kernel/head.S
+++ b/arch/ia64/kernel/head.S
@@ -19,6 +19,7 @@
  *   Support for CPU Hotplug
  */
 
+#include <linux/config.h>
 
 #include <asm/asmmacro.h>
 #include <asm/fpu.h>
@@ -197,11 +198,6 @@ start_ap:
        ;;
        srlz.i
        ;;
- {
-       flushrs                         // must be first insn in group
-       srlz.i
- }
-       ;;
        /*
         * Save the region registers, predicate before they get clobbered
         */
@@ -367,12 +363,6 @@ start_ap:
        ;;
 (isBP) st8 [r2]=r28            // save the address of the boot param area passed by the bootloader
 
-#ifdef CONFIG_XEN
-       //  Note: isBP is used by the subprogram.
-       br.call.sptk.many rp=early_xen_setup
-       ;;
-#endif
-
 #ifdef CONFIG_SMP
 (isAP) br.call.sptk.many rp=start_secondary
 .ret0:
@@ -864,6 +854,7 @@ END(__ia64_init_fpu)
  */
 GLOBAL_ENTRY(ia64_switch_mode_phys)
  {
+       alloc r2=ar.pfs,0,0,0,0
        rsm psr.i | psr.ic              // disable interrupts and interrupt collection
        mov r15=ip
  }
@@ -912,6 +903,7 @@ END(ia64_switch_mode_phys)
  */
 GLOBAL_ENTRY(ia64_switch_mode_virt)
  {
+       alloc r2=ar.pfs,0,0,0,0
        rsm psr.i | psr.ic              // disable interrupts and interrupt collection
        mov r15=ip
  }