Update ia64 patch to 2.5.69-030521, throwing away the parts included

[linux-flexiantxendom0-3.2.10.git] / arch / ia64 / sn / fakeprom / fpromasm.S

diff --git a/arch/ia64/sn/fakeprom/fpromasm.S b/arch/ia64/sn/fakeprom/fpromasm.S
index 2c9c603..aa24f6f 100644 (file)
--- a/arch/ia64/sn/fakeprom/fpromasm.S
+++ b/arch/ia64/sn/fakeprom/fpromasm.S
@@ -8,7 +8,7 @@
  * Copyright (C) 1998-2000 Hewlett-Packard Co
  * Copyright (C) 1998-2000 David Mosberger-Tang <davidm@hpl.hp.com>
  *
- * Copyright (C) 2000-2002 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 2000-2003 Silicon Graphics, Inc. All rights reserved.
  */
 
 
@@ -57,9 +57,7 @@
  * be 0x00000ffffc000000, but on snia we use the (inverse swizzled)
  * IOSPEC_BASE value
  */
-#ifdef CONFIG_IA64_SGI_SN1
-#define IOPB_PA                0xc0000FFFFC000000
-#else
+#ifdef SGI_SN2
 #define IOPB_PA                0xc000000fcc000000
 #endif
 
@@ -84,10 +82,7 @@ _start:
 
 // Isolate node number we are running on.
        mov             r6 = ip;;
-#ifdef CONFIG_IA64_SGI_SN1
-       shr             r5 = r6,33;;                    // r5 = node number
-       shl             r6 = r5,33                      // r6 = base memory address of node
-#else
+#ifdef SGI_SN2
        shr             r5 = r6,38                      // r5 = node number
        dep             r6 = 0,r6,0,36                  // r6 = base memory address of node
 
@@ -99,7 +94,7 @@ _start:
        or              r1 = r1,r6                      // Relocate to boot node
 
 // Lets figure out who we are & put it in the LID register.
-#ifdef CONFIG_IA64_SGI_SN2
+#ifdef SGI_SN2
 // On SN2, we (currently) pass the cpu number in r10 at boot
        and             r25=3,r10;;
        movl            r16=0x8000008110000400          // Allow IPIs
@@ -324,10 +319,7 @@ static:    cmp.eq  p6,p7=6,r28             /* PAL_PTCE_INFO */
 1:     cmp.eq  p6,p7=8,r28             /* PAL_VM_SUMMARY */
 (p7)   br.cond.sptk.few 1f
        movl    r8=0
-#ifdef CONFIG_IA64_SGI_SN1
-       movl    r9=0x0203083001151059
-       movl    r10=0x1232
-#else
+#ifdef SGI_SN2
        movl    r9=0x0203083001151065
        movl    r10=0x183f
 #endif