[Linux-mips-commits]CVS: linux/include/asm-mips mmu.h,NONE,1.1 bootinfo.h,1.32,1.33 io.h,1.21,1.22 types.h,1.1,1.2

[Steve L. <slo...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv30225/include/asm-mips

Modified Files:
	bootinfo.h io.h types.h 
Added Files:
	mmu.h 
Log Message:
- consolidate all architectures to use type phys_addr_t for physical
  addresses. MIPS-only phys_t is gone, replaced with phys_addr_t.

- remap_page_range() will "fixup" physaddr's for platforms with 64-bit
  physaddr support enabled, just as __ioremap() does.
  


--- NEW FILE: mmu.h ---
#ifndef __MMU_H
#define __MMU_H

#ifdef CONFIG_64BIT_PHYS_ADDR
typedef unsigned long long phys_addr_t;
extern phys_addr_t (*__ioremap_fixup)(phys_addr_t, phys_addr_t);
#define fixup_bigphys_addr(addr, size) __ioremap_fixup(addr, size)
#else
#include <asm-generic/mmu.h>
#endif


/* Default "unsigned long" context */
typedef unsigned long mm_context_t;

#endif

Index: bootinfo.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/bootinfo.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- bootinfo.h	12 Jul 2002 20:14:28 -0000	1.32
+++ bootinfo.h	17 Sep 2002 18:20:01 -0000	1.33
@@ -207,14 +207,14 @@
 struct boot_mem_map {
 	int nr_map;
 	struct {
-		phys_t addr;	/* start of memory segment */
-		phys_t size;	/* size of memory segment */
+		phys_addr_t addr;	/* start of memory segment */
+		phys_addr_t size;	/* size of memory segment */
 		long type;		/* type of memory segment */
 	} map[BOOT_MEM_MAP_MAX];
 };
 
 extern struct boot_mem_map boot_mem_map;
 
-extern void add_memory_region(phys_t start, phys_t size, long type);
+extern void add_memory_region(phys_addr_t start, phys_addr_t size, long type);
 
 #endif /* _ASM_BOOTINFO_H */

Index: io.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/io.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- io.h	21 Apr 2002 20:19:17 -0000	1.21
+++ io.h	17 Sep 2002 18:20:01 -0000	1.22
@@ -133,7 +133,8 @@
  */
 #define page_to_phys(page)	((page - mem_map) << PAGE_SHIFT)
 
-extern void * __ioremap(phys_t offset, phys_t size, unsigned long flags);
+extern void * __ioremap(phys_addr_t offset, phys_addr_t size,
+			unsigned long flags);
 
 #define ioremap(offset, size)						\
 	__ioremap((offset), (size), _CACHE_UNCACHED)

Index: types.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/types.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- types.h	12 Feb 2002 18:14:20 -0000	1.1
+++ types.h	17 Sep 2002 18:20:01 -0000	1.2
@@ -72,12 +72,6 @@
 typedef u32 dma_addr_t;
 typedef u64 dma64_addr_t;
 
-#ifdef CONFIG_64BIT_PHYS_ADDR
-typedef unsigned long long phys_t;
-#else
-typedef unsigned long phys_t;
-#endif
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_TYPES_H */