vserver 2.0 rc7

[linux-2.6.git] / include / asm-ia64 / sn / pda.h

diff --git a/include/asm-ia64/sn/pda.h b/include/asm-ia64/sn/pda.h
index 6465e8a..ea5590c 100644 (file)
--- a/include/asm-ia64/sn/pda.h
+++ b/include/asm-ia64/sn/pda.h
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1992 - 1997, 2000-2004 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1992 - 1997, 2000-2005 Silicon Graphics, Inc. All rights reserved.
  */
 #ifndef _ASM_IA64_SN_PDA_H
 #define _ASM_IA64_SN_PDA_H
@@ -11,7 +11,6 @@
 #include <linux/cache.h>
 #include <asm/percpu.h>
 #include <asm/system.h>
-#include <asm/sn/bte.h>
 
 
 /*
@@ -25,23 +24,10 @@
 
 typedef struct pda_s {
 
-       /* Having a pointer in the begining of PDA tends to increase
-        * the chance of having this pointer in cache. (Yes something
-        * else gets pushed out). Doing this reduces the number of memory
-        * access to all nodepda variables to be one
-        */
-       struct nodepda_s *p_nodepda;            /* Pointer to Per node PDA */
-       struct subnodepda_s *p_subnodepda;      /* Pointer to CPU  subnode PDA */
-
        /*
         * Support for SN LEDs
         */
        volatile short  *led_address;
-       u16             nasid_bitmask;
-       u8              shub2;
-       u8              nasid_shift;
-       u8              as_shift;
-       u8              shub_1_1_found;
        u8              led_state;
        u8              hb_state;       /* supports blinking heartbeat leds */
        unsigned int    hb_count;
@@ -53,11 +39,8 @@ typedef struct pda_s {
        unsigned long pio_write_status_val;
        volatile unsigned long *pio_shub_war_cam_addr;
 
-       struct bteinfo_s *cpu_bte_if[BTES_PER_NODE];    /* cpu interface order */
-
        unsigned long   sn_soft_irr[4];
        unsigned long   sn_in_service_ivecs[4];
-       short           cnodeid_to_nasid_table[MAX_NUMNODES];
        int             sn_lb_int_war_ticks;
        int             sn_last_irq;
        int             sn_first_irq;
@@ -84,12 +67,4 @@ DECLARE_PER_CPU(struct pda_s, pda_percpu);
 
 #define pdacpu(cpu)    (&per_cpu(pda_percpu, cpu))
 
-/*
- * Use this macro to test if shub 1.1 wars should be enabled
- */
-#define enable_shub_wars_1_1() (pda->shub_1_1_found)
-
-#define is_shub2()     (pda->shub2)
-#define is_shub1()     (pda->shub2 == 0)
-
 #endif /* _ASM_IA64_SN_PDA_H */