diff -Nru a/arch/ia64/sn/kernel/bte.c b/arch/ia64/sn/kernel/bte.c
--- a/arch/ia64/sn/kernel/bte.c	2004-10-29 17:22:53 -07:00
+++ b/arch/ia64/sn/kernel/bte.c	2004-10-29 17:22:53 -07:00
@@ -10,7 +10,6 @@
 #include <linux/module.h>
 #include <asm/sn/nodepda.h>
 #include <asm/sn/addrs.h>
-#include <asm/sn/arch.h>
 #include <asm/sn/sn_cpuid.h>
 #include <asm/sn/pda.h>
 #include "shubio.h"
diff -Nru a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
--- a/arch/ia64/sn/kernel/irq.c	2004-10-29 17:22:53 -07:00
+++ b/arch/ia64/sn/kernel/irq.c	2004-10-29 17:22:53 -07:00
@@ -11,7 +11,6 @@
 #include <linux/irq.h>
 #include <asm/sn/intr.h>
 #include <asm/sn/addrs.h>
-#include <asm/sn/arch.h>
 #include "xtalk/xwidgetdev.h"
 #include "pci/pcibus_provider_defs.h"
 #include "pci/pcidev.h"
diff -Nru a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
--- a/arch/ia64/sn/kernel/setup.c	2004-10-29 17:22:53 -07:00
+++ b/arch/ia64/sn/kernel/setup.c	2004-10-29 17:22:53 -07:00
@@ -34,7 +34,6 @@
 #include <asm/machvec.h>
 #include <asm/system.h>
 #include <asm/processor.h>
-#include <asm/sn/arch.h>
 #include <asm/sn/addrs.h>
 #include <asm/sn/pda.h>
 #include <asm/sn/nodepda.h>
diff -Nru a/arch/ia64/sn/kernel/sn2/Makefile b/arch/ia64/sn/kernel/sn2/Makefile
--- a/arch/ia64/sn/kernel/sn2/Makefile	2004-10-29 17:22:53 -07:00
+++ b/arch/ia64/sn/kernel/sn2/Makefile	2004-10-29 17:22:53 -07:00
@@ -9,5 +9,5 @@
 # sn2 specific kernel files
 #
 
-obj-y += cache.o io.o ptc_deadlock.o sn2_smp.o sn_proc_fs.o \
+obj-y += io.o ptc_deadlock.o sn2_smp.o sn_proc_fs.o \
 	 prominfo_proc.o timer.o timer_interrupt.o sn_hwperf.o
diff -Nru a/arch/ia64/sn/kernel/sn2/cache.c b/arch/ia64/sn/kernel/sn2/cache.c
--- a/arch/ia64/sn/kernel/sn2/cache.c	2004-10-29 17:22:53 -07:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,34 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- * 
- * Copyright (C) 2001-2003 Silicon Graphics, Inc. All rights reserved.
- *
- */
-#include <linux/module.h>
-#include <asm/pgalloc.h>
-
-/**
- * sn_flush_all_caches - flush a range of address from all caches (incl. L4)
- * @flush_addr: identity mapped region 7 address to start flushing
- * @bytes: number of bytes to flush
- *
- * Flush a range of addresses from all caches including L4. 
- * All addresses fully or partially contained within 
- * @flush_addr to @flush_addr + @bytes are flushed
- * from the all caches.
- */
-void
-sn_flush_all_caches(long flush_addr, long bytes)
-{
-	flush_icache_range(flush_addr, flush_addr+bytes);
-	/*
-	 * The last call may have returned before the caches
-	 * were actually flushed, so we call it again to make
-	 * sure.
-	 */
-	flush_icache_range(flush_addr, flush_addr+bytes);
-	mb();
-}
-EXPORT_SYMBOL(sn_flush_all_caches);
diff -Nru a/include/asm-ia64/sn/arch.h b/include/asm-ia64/sn/arch.h
--- a/include/asm-ia64/sn/arch.h	2004-10-29 17:22:53 -07:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,27 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * SGI specific setup.
- *
- * Copyright (C) 1995-1997,1999,2001-2004 Silicon Graphics, Inc.  All rights reserved.
- * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org)
- */
-#ifndef _ASM_IA64_SN_ARCH_H
-#define _ASM_IA64_SN_ARCH_H
-
-#include <asm/types.h>
-#include <asm/sn/types.h>
-#include <asm/sn/sn_cpuid.h>
-
-/*
- * This is the maximum number of nodes that can be part of a kernel.
- * Effectively, it's the maximum number of compact node ids (cnodeid_t).
- * This is not necessarily the same as MAX_NASIDS.
- */
-#define MAX_COMPACT_NODES       2048
-
-extern void sn_flush_all_caches(long addr, long bytes);
-
-#endif /* _ASM_IA64_SN_ARCH_H */
diff -Nru a/include/asm-ia64/sn/nodepda.h b/include/asm-ia64/sn/nodepda.h
--- a/include/asm-ia64/sn/nodepda.h	2004-10-29 17:22:53 -07:00
+++ b/include/asm-ia64/sn/nodepda.h	2004-10-29 17:22:53 -07:00
@@ -17,6 +17,13 @@
 #include <asm/sn/bte.h>
 
 /*
+ * This is the maximum number of nodes that can be part of a kernel.
+ * Effectively, it's the maximum number of compact node ids (cnodeid_t).
+ * This is not necessarily the same as MAX_NASIDS.
+ */
+#define MAX_COMPACT_NODES       2048
+
+/*
  * NUMA Node-Specific Data structures are defined in this file.
  * In particular, this is the location of the node PDA.
  * A pointer to the right node PDA is saved in each CPU PDA.
diff -Nru a/include/asm-ia64/sn/router.h b/include/asm-ia64/sn/router.h
--- a/include/asm-ia64/sn/router.h	2004-10-29 17:22:53 -07:00
+++ b/include/asm-ia64/sn/router.h	2004-10-29 17:22:53 -07:00
@@ -17,7 +17,8 @@
 
 #ifndef __ASSEMBLY__
 
-#include <asm/sn/arch.h>
+#include <asm/sn/types.h>
+#include <asm/sn/geo.h>
 
 typedef uint64_t	router_reg_t;
 
diff -Nru a/include/asm-ia64/sn/sn_sal.h b/include/asm-ia64/sn/sn_sal.h
--- a/include/asm-ia64/sn/sn_sal.h	2004-10-29 17:22:53 -07:00
+++ b/include/asm-ia64/sn/sn_sal.h	2004-10-29 17:22:53 -07:00
@@ -15,7 +15,6 @@
 #include <linux/config.h>
 #include <asm/sal.h>
 #include <asm/sn/sn_cpuid.h>
-#include <asm/sn/arch.h>
 #include <asm/sn/geo.h>
 #include <asm/sn/nodepda.h>