4 files changed, 18 insertions, 10 deletions
diff --git a/include/asm-mips64/module.h b/include/asm-mips64/module.h
new file mode 100644
index 000000000..dbc894f7e
--- /dev/null
+++ b/include/asm-mips64/module.h
@@ -0,0 +1,11 @@
+#ifndef _ASM_MIPS64_MODULE_H
+#define _ASM_MIPS64_MODULE_H
+/*
+ * This file contains the mips64 architecture specific module code.
+ */
+
+#define module_map(x)		vmalloc(x)
+#define module_unmap(x)		vfree(x)
+#define module_arch_init(x)	(0)
+
+#endif /* _ASM_MIPS64_MODULE_H */
diff --git a/include/asm-mips64/pgtable.h b/include/asm-mips64/pgtable.h
index 4874a59e5..af0c7b4c9 100644
--- a/include/asm-mips64/pgtable.h
+++ b/include/asm-mips64/pgtable.h
@@ -525,9 +525,6 @@ extern inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
 #define pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })
 #define swp_entry_to_pte(x)	((pte_t) { (x).val })
 
-#define module_map      vmalloc
-#define module_unmap    vfree
-
 /* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
 #define PageSkip(page)		(0)
 #ifndef CONFIG_DISCONTIGMEM
diff --git a/include/asm-mips64/sn/ioc3.h b/include/asm-mips64/sn/ioc3.h
index 57a2abbf2..f7d530f30 100644
--- a/include/asm-mips64/sn/ioc3.h
+++ b/include/asm-mips64/sn/ioc3.h
@@ -1,10 +1,9 @@
-/* $Id: ioc3.h,v 1.1 2000/01/13 00:17:02 ralf Exp $
- *
- * Copyright (C) 1999 Ralf Baechle
- * This file is part of the Linux driver for the SGI IOC3.
+/*
+ * Copyright (C) 1999, 2000 Ralf Baechle
+ * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
  */
-#ifndef IOC3_H
-#define IOC3_H
+#ifndef _IOC3_H
+#define _IOC3_H
 
 /* SUPERIO uart register map */
 typedef volatile struct ioc3_uartregs {
@@ -659,4 +658,4 @@ typedef enum ioc3_subdevs_e {
 #define IOC3_INTA_SUBDEVS	IOC3_SDB_ETHER
 #define IOC3_INTB_SUBDEVS	(IOC3_SDB_GENERIC|IOC3_SDB_KBMS|IOC3_SDB_SERIAL|IOC3_SDB_ECPP|IOC3_SDB_RT)
 
-#endif /* IOC3_H */
+#endif /* _IOC3_H */
diff --git a/include/asm-mips64/xor.h b/include/asm-mips64/xor.h
new file mode 100644
index 000000000..c82eb12a5
--- /dev/null
+++ b/include/asm-mips64/xor.h
@@ -0,0 +1 @@
+#include <asm-generic/xor.h>