[MIPS] IP27: Remove leftovers of sable support.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/include/asm-mips/sn/kldir.h b/include/asm-mips/sn/kldir.h
index fa40e6794f827135f9fd8601d955b11e5edb39e5..97ad52e3cbc7ded4f57f853b3bf27577d979aeef 100644 (file)
--- a/include/asm-mips/sn/kldir.h
+++ b/include/asm-mips/sn/kldir.h
@@ -141,7 +141,7 @@
  */
 #define SYMMON_STACK_SIZE              0x8000
 
-#if defined (PROM) || defined (SABLE)
+#if defined (PROM)
 
 /*
  * These defines are prom version dependent.  No code other than the IP27
@@ -178,7 +178,7 @@
 #define IP27_FREEMEM_COUNT             1
 #define IP27_FREEMEM_STRIDE            0
 
-#endif /* PROM || SABLE*/
+#endif /* PROM */
 /*
  * There will be only one of these in a partition so the IO6 must set it up.
  */

diff --git a/include/asm-mips/sn/sn0/addrs.h b/include/asm-mips/sn/sn0/addrs.h
index 398815639fb893fc299a2b14269f058db1d1e89a..7cb9c31f6878c76b77994ff71468d0f744e75885 100644 (file)
--- a/include/asm-mips/sn/sn0/addrs.h
+++ b/include/asm-mips/sn/sn0/addrs.h
@@ -143,12 +143,7 @@
 #define SN0_WIDGET_BASE(_nasid, _wid)  (NODE_SWIN_BASE((_nasid), (_wid)))
 
 /* Turn on sable logging for the processors whose bits are set. */
-#ifdef SABLE
-#define SABLE_LOG_TRIGGER(_map)        \
-               *((volatile hubreg_t *)(IO_BASE + 0x17ffff0)) = (_map)
-#else
 #define SABLE_LOG_TRIGGER(_map)
-#endif /* SABLE */
 
 #ifndef __ASSEMBLY__
 #define KERN_NMI_ADDR(nasid, slice)                                    \

diff --git a/include/asm-mips/sn/sn0/arch.h b/include/asm-mips/sn/sn0/arch.h
index fb78773a5efed10f94111a6d887751922d5c5d5e..5643a6e639bd88ce635716cd7b6ec415530973f0 100644 (file)
--- a/include/asm-mips/sn/sn0/arch.h
+++ b/include/asm-mips/sn/sn0/arch.h
@@ -13,8 +13,6 @@
 
 #include <linux/config.h>
 
-#ifndef SABLE
-
 #ifndef SN0XXL  /* 128 cpu SMP max */
 /*
  * This is the maximum number of nodes that can be part of a kernel.
@@ -54,15 +52,6 @@
  */
 #define MAX_PARTITIONS         MAX_REGIONS
 
-
-#else
-
-#define MAX_COMPACT_NODES      4
-#define MAX_NASIDS             4
-#define MAXCPUS                        8
-
-#endif
-
 #define NASID_MASK_BYTES       ((MAX_NASIDS + 7) / 8)
 
 /*

diff --git a/include/asm-mips/sn/sn0/hub.h b/include/asm-mips/sn/sn0/hub.h
index f5dbba6f4610c7f0826f3231c445b0ead9ca85ee..3e228f8e79695ff386d3d8f56989486733697d4a 100644 (file)
--- a/include/asm-mips/sn/sn0/hub.h
+++ b/include/asm-mips/sn/sn0/hub.h
@@ -31,10 +31,6 @@
 #include <asm/sn/sn0/hubni.h>
 //#include <asm/sn/sn0/hubcore.h>
 
-#ifdef SABLE
-#define IP27_NO_HUBUART_INT    1
-#endif
-
 /* Translation of uncached attributes */
 #define        UATTR_HSPEC     0
 #define        UATTR_IO        1