patch-2.3.23 linux/arch/arm/mm/mm-nexuspci.c

• Lines: 41
• Date: Wed Oct 20 16:29:08 1999
• Orig file: v2.3.22/linux/arch/arm/mm/mm-nexuspci.c
• Orig date: Sat Jul 18 11:55:23 1998

diff -u --recursive --new-file v2.3.22/linux/arch/arm/mm/mm-nexuspci.c linux/arch/arm/mm/mm-nexuspci.c
@@ -5,7 +5,7 @@
  * Extra MM routines for the NexusPCI architecture
  *
  * Copyright (C) 1998 Phil Blundell
- * Copyright (C) 1998 Russell King
+ * Copyright (C) 1998-1999 Russell King
  */
 
 #include <linux/sched.h>
@@ -15,13 +15,23 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <asm/io.h>
-#include <asm/proc/mm-init.h>
+
+#include "map.h"
  
-#define MAPPING								\
- 	{ 0xfff00000, 0x10000000, 0x00001000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xffe00000, 0x20000000, 0x00001000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xffc00000, 0x60000000, 0x00001000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xfe000000, 0x80000000, 0x00100000, DOMAIN_IO, 0, 1 },	\
- 	{ 0xfd000000, 0x88000000, 0x00100000, DOMAIN_IO, 0, 1 }
+struct mem_desc mem_desc[] __initdata = {
+	0, 0
+};
+
+unsigned int __initdata mem_desc_size = 0;
+
+const struct map_desc io_desc[] __initdata = {
+ 	{ 0xfff00000, 0x10000000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xffe00000, 0x20000000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xffc00000, 0x60000000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xfe000000, 0x80000000, 0x00100000, DOMAIN_IO, 0, 1, 0, 0 },
+ 	{ 0xfd000000, 0x88000000, 0x00100000, DOMAIN_IO, 0, 1, 0, 0 }
+};
+
+#define SIZEOFMAP (sizeof(mapping) / sizeof(mapping[0]))
 
-#include "mm-armv.c"
+unsigned int __initdata io_desc_size = SIZEOFMAP;