Introduce phys_size_t and move phys_addr_t into asm/types.h

Also add CONFIG_PHYS_64BIT on powerpc to deal with 32-bit ppc's
that have larger physical addresses like 44x, 85xx, and 86xx.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h
index 029b7f9eeb41de1431927e00a26e2aea980e7eef..c33b9e8d34271e2c531ed1483dfe3d279270a7d6 100644 (file)
--- a/include/asm-arm/io.h
+++ b/include/asm-arm/io.h
@@ -38,8 +38,6 @@ static inline void sync(void)
  * that can be used to access the memory range with the caching
  * properties specified by "flags".
  */
-typedef unsigned long phys_addr_t;
-
 #define MAP_NOCACHE    (0)
 #define MAP_WRCOMBINE  (0)
 #define MAP_WRBACK     (0)

diff --git a/include/asm-arm/types.h b/include/asm-arm/types.h
index e56f19d29be1643bae1781438ff93af9e331b5ed..71dc049da625e521674a6b0cd412283ecade7305 100644 (file)
--- a/include/asm-arm/types.h
+++ b/include/asm-arm/types.h
@@ -45,6 +45,9 @@ typedef unsigned long long u64;
 
 typedef u32 dma_addr_t;
 
+typedef unsigned long phys_addr_t;
+typedef unsigned long phys_size_t;
+
 #endif /* __KERNEL__ */
 
 #endif

diff --git a/include/asm-avr32/io.h b/include/asm-avr32/io.h
index ba14674cf73780bbb72d3b3de5cb41513d3a3697..d030c262a584f5d92d3dc8646b2100c9ffd39a89 100644 (file)
--- a/include/asm-avr32/io.h
+++ b/include/asm-avr32/io.h
@@ -101,8 +101,6 @@ static inline void sync(void)
  * This implementation works for memory below 512MiB (flash, etc.) as
  * well as above 3.5GiB (internal peripherals.)
  */
-typedef unsigned long phys_addr_t;
-
 #define MAP_NOCACHE    (0)
 #define MAP_WRCOMBINE  (1 << 7)
 #define MAP_WRBACK     (MAP_WRCOMBINE | (1 << 9))

diff --git a/include/asm-avr32/types.h b/include/asm-avr32/types.h
index 2dbea4bad35a716f427eef66cccf92310a0ba2cd..c303e3c89123f8f3356cca9eb16b34e389b0a25e 100644 (file)
--- a/include/asm-avr32/types.h
+++ b/include/asm-avr32/types.h
@@ -71,6 +71,9 @@ typedef unsigned long long u64;
 
 typedef u32 dma_addr_t;
 
+typedef unsigned long phys_addr_t;
+typedef unsigned long phys_size_t;
+
 #ifdef CONFIG_LBD
 typedef u64 sector_t;
 #define HAVE_SECTOR_T

diff --git a/include/asm-blackfin/io.h b/include/asm-blackfin/io.h
index 2149685c179cee079c9d1ff284ab9d5dff5823f7..da58914987c2241a369752da3fc5c35e72489db7 100644 (file)
--- a/include/asm-blackfin/io.h
+++ b/include/asm-blackfin/io.h
@@ -45,8 +45,6 @@ extern void cf_outb(unsigned char val, volatile unsigned char *addr);
  * that can be used to access the memory range with the caching
  * properties specified by "flags".
  */
-typedef unsigned long phys_addr_t;
-
 #define MAP_NOCACHE    (0)
 #define MAP_WRCOMBINE  (0)
 #define MAP_WRBACK     (0)

diff --git a/include/asm-blackfin/types.h b/include/asm-blackfin/types.h
index 9fd8e03360448b4c03eee8a5dde6190818728d37..2160ba0d02927353b20bbd917b721bbc5cfb8114 100644 (file)
--- a/include/asm-blackfin/types.h
+++ b/include/asm-blackfin/types.h
@@ -78,6 +78,9 @@ typedef unsigned long long u64;
 
 typedef u32 dma_addr_t;
 
+typedef unsigned long phys_addr_t;
+typedef unsigned long phys_size_t;
+
 #endif
 
 #endif

diff --git a/include/asm-i386/io.h b/include/asm-i386/io.h
index db4f4428178564e4dc77dc604afdb1f23c13563b..2c57140fb39047cf0a354b3fd5228f0909f10621 100644 (file)
--- a/include/asm-i386/io.h
+++ b/include/asm-i386/io.h
@@ -210,8 +210,6 @@ static inline void sync(void)
  * that can be used to access the memory range with the caching
  * properties specified by "flags".
  */
-typedef unsigned long phys_addr_t;
-
 #define MAP_NOCACHE    (0)
 #define MAP_WRCOMBINE  (0)
 #define MAP_WRBACK     (0)

diff --git a/include/asm-i386/types.h b/include/asm-i386/types.h
index bdbde4172ae10f93c74f1747db952bd24655861a..9a40e383eb35afc93ac0b07cbded5530908b4a18 100644 (file)
--- a/include/asm-i386/types.h
+++ b/include/asm-i386/types.h
@@ -45,6 +45,9 @@ typedef unsigned long long u64;
 
 typedef u32 dma_addr_t;
 
+typedef unsigned long phys_addr_t;
+typedef unsigned long phys_size_t;
+
 #endif /* __KERNEL__ */
 
 #endif

diff --git a/include/asm-m68k/io.h b/include/asm-m68k/io.h
index 33c454a4373155dc25bb372830007a60aea0d4a0..1fccc1292328c3efb04b7a9863e02f72b7ca8524 100644 (file)
--- a/include/asm-m68k/io.h
+++ b/include/asm-m68k/io.h
@@ -232,8 +232,6 @@ static inline void sync(void)
  * that can be used to access the memory range with the caching
  * properties specified by "flags".
  */
-typedef unsigned long phys_addr_t;
-
 #define MAP_NOCACHE    (0)
 #define MAP_WRCOMBINE  (0)
 #define MAP_WRBACK     (0)

diff --git a/include/asm-m68k/types.h b/include/asm-m68k/types.h
index e944d3fd19239ab022cd4a385b3239d1e2cda35d..44b4ca5bd5a77f1f21c60bb4265e45e8dc754697 100644 (file)
--- a/include/asm-m68k/types.h
+++ b/include/asm-m68k/types.h
@@ -44,6 +44,9 @@ typedef unsigned long long u64;
 /* DMA addresses are 32-bits wide */
 typedef u32 dma_addr_t;
 
+typedef unsigned long phys_addr_t;
+typedef unsigned long phys_size_t;
+
 #endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
 

diff --git a/include/asm-microblaze/io.h b/include/asm-microblaze/io.h
index 90d18428ad1e960ab67b3e48849e7c0207b8a4ce..aa37a60ce75af5b8db88a39947822080bad5d570 100644 (file)
--- a/include/asm-microblaze/io.h
+++ b/include/asm-microblaze/io.h
@@ -134,8 +134,6 @@ static inline void sync(void)
  * that can be used to access the memory range with the caching
  * properties specified by "flags".
  */
-typedef unsigned long phys_addr_t;
-
 #define MAP_NOCACHE    (0)
 #define MAP_WRCOMBINE  (0)
 #define MAP_WRBACK     (0)

diff --git a/include/asm-microblaze/types.h b/include/asm-microblaze/types.h
index 3895dc436503a78b39e9de633cab232b2f880a07..77094f62d6322fd43361ec00e6fcd28baf5f9051 100644 (file)
--- a/include/asm-microblaze/types.h
+++ b/include/asm-microblaze/types.h
@@ -52,6 +52,9 @@ typedef unsigned long long u64;
 /* Dma addresses are 32-bits wide.  */
 
 typedef u32 dma_addr_t;
+
+typedef unsigned long phys_addr_t;
+typedef unsigned long phys_size_t;
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_TYPES_H */

diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h
index e27d1f159d72527c7e1434eb8f7746f8f656cf98..7137072ce459f76e29ca579ada27c0fbe5bd775b 100644 (file)
--- a/include/asm-mips/io.h
+++ b/include/asm-mips/io.h
@@ -470,8 +470,6 @@ static inline void sync(void)
  * that can be used to access the memory range with the caching
  * properties specified by "flags".
  */
-typedef unsigned long phys_addr_t;
-
 #define MAP_NOCACHE    (0)
 #define MAP_WRCOMBINE  (0)
 #define MAP_WRBACK     (0)

diff --git a/include/asm-mips/types.h b/include/asm-mips/types.h
index f49a2176af0951583b4e902cbde130d4cb6a5e34..d4bb85999bb0072a5b4265bb0f4c4d1ce2bff67d 100644 (file)
--- a/include/asm-mips/types.h
+++ b/include/asm-mips/types.h
@@ -78,8 +78,16 @@ typedef unsigned long long u64;
 #if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
     || defined(CONFIG_64BIT)
 typedef u64 dma_addr_t;
+
+typedef u64 phys_addr_t;
+typedef u64 phys_size_t;
+
 #else
 typedef u32 dma_addr_t;
+
+typedef u32 phys_addr_t;
+typedef u32 phys_size_t;
+
 #endif
 typedef u64 dma64_addr_t;
 

diff --git a/include/asm-nios/io.h b/include/asm-nios/io.h
index 6fc339fb01994fed03b435b0e5c5dd40ad9f0ea6..12a0bd9152c767ea2a8aa73afe625e62a74452d5 100644 (file)
--- a/include/asm-nios/io.h
+++ b/include/asm-nios/io.h
@@ -114,8 +114,6 @@ static inline void sync(void)
  * that can be used to access the memory range with the caching
  * properties specified by "flags".
  */
-typedef unsigned long phys_addr_t;
-
 #define MAP_NOCACHE    (0)
 #define MAP_WRCOMBINE  (0)
 #define MAP_WRBACK     (0)

diff --git a/include/asm-nios/types.h b/include/asm-nios/types.h
index 24c98a89e4a3873ccee5d3edf0b02502fe9baba1..636e12fd38e4de92f52c0eafe834ce115efe90e9 100644 (file)
--- a/include/asm-nios/types.h
+++ b/include/asm-nios/types.h
@@ -52,6 +52,9 @@ typedef unsigned long long u64;
 /* Dma addresses are 32-bits wide.  */
 
 typedef u32 dma_addr_t;
+
+typedef unsigned long phys_addr_t;
+typedef unsigned long phys_size_t;
 #endif /* __KERNEL__ */
 
 #endif /* _NIOS_TYPES_H */

diff --git a/include/asm-nios2/io.h b/include/asm-nios2/io.h
index a52b95cf235c37f3fcd1cc16ca7e027648b2db9e..2f1ec26bd16f3770df3156915953913602f59585 100644 (file)
--- a/include/asm-nios2/io.h
+++ b/include/asm-nios2/io.h
@@ -34,8 +34,6 @@ static inline void sync(void)
  * that can be used to access the memory range with the caching
  * properties specified by "flags".
  */
-typedef unsigned long phys_addr_t;
-
 #define MAP_NOCACHE    (0)
 #define MAP_WRCOMBINE  (0)
 #define MAP_WRBACK     (0)

diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h
index 91c9c1e4c693335d6db2a1391d2e5e0a21ef804b..00b7ec57e40968624b87287a8324cd619c8612c5 100644 (file)
--- a/include/asm-ppc/io.h
+++ b/include/asm-ppc/io.h
@@ -243,8 +243,6 @@ extern inline void out_be32(volatile unsigned __iomem *addr, int val)
  * that can be used to access the memory range with the caching
  * properties specified by "flags".
  */
-typedef unsigned long phys_addr_t;
-
 #define MAP_NOCACHE    (0)
 #define MAP_WRCOMBINE  (0)
 #define MAP_WRBACK     (0)

diff --git a/include/asm-ppc/types.h b/include/asm-ppc/types.h
index 7adf1450f250f29c7ff473784e0518053f04fd1f..864391f03bd12391e215b625f544efbec4fe8bcd 100644 (file)
--- a/include/asm-ppc/types.h
+++ b/include/asm-ppc/types.h
@@ -44,6 +44,14 @@ typedef unsigned long long u64;
 /* DMA addresses are 32-bits wide */
 typedef u32 dma_addr_t;
 
+#ifdef CONFIG_PHYS_64BIT
+typedef unsigned long long phys_addr_t;
+typedef unsigned long long phys_size_t;
+#else
+typedef unsigned long phys_addr_t;
+typedef unsigned long phys_size_t;
+#endif
+
 #endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
 

diff --git a/include/asm-sh/io.h b/include/asm-sh/io.h
index 51fd10b566ac2614baea447204cc9f7bc28a4585..740029300c2c347743879c16a43abde42b44b6f1 100644 (file)
--- a/include/asm-sh/io.h
+++ b/include/asm-sh/io.h
@@ -233,8 +233,6 @@ static inline void sync(void)
  * that can be used to access the memory range with the caching
  * properties specified by "flags".
  */
-typedef unsigned long phys_addr_t;
-
 #define MAP_NOCACHE     (0)
 #define MAP_WRCOMBINE   (0)
 #define MAP_WRBACK      (0)

diff --git a/include/asm-sh/types.h b/include/asm-sh/types.h
index 7ba69d9707eff7eecc876b345469ee81a8461866..aed4a6eb57c9ff4a472c5a5abe823b090ad08231 100644 (file)
--- a/include/asm-sh/types.h
+++ b/include/asm-sh/types.h
@@ -52,6 +52,9 @@ typedef unsigned long long u64;
 
 typedef u32 dma_addr_t;
 
+typedef unsigned long phys_addr_t;
+typedef unsigned long phys_size_t;
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */