summaryrefslogtreecommitdiff
path: root/include/asm-powerpc/types.h
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2008-04-16 05:52:27 +1000
committerPaul Mackerras <paulus@samba.org>2008-04-17 07:46:14 +1000
commitd04ceb3fc294ea2c4f538a04343f3a473953a3b0 (patch)
treecd209e458ffaf89b6af35352629743ab600c390d /include/asm-powerpc/types.h
parent4846c5deb9776a7306d0f656ade7505278ac39ba (diff)
[POWERPC] Move phys_addr_t definition into asm/types.h
Moved phys_addr_t out of mmu-*.h and into asm/types.h so we can use it in places that before would have caused recursive includes. For example to use phys_addr_t in <asm/page.h> we would have included <asm/mmu.h> which would have possibly included <asm/mmu-hash64.h> which includes <asm/page.h>. Wheeee recursive include. CONFIG_PHYS_64BIT is a bit counterintuitive in light of ppc64 systems and thus the config option is only used for ppc32 systems with >32-bit physical addresses (44x, 85xx, 745x, etc.). Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/types.h')
-rw-r--r--include/asm-powerpc/types.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-powerpc/types.h b/include/asm-powerpc/types.h
index 903fd1932436..c243a6ac60e5 100644
--- a/include/asm-powerpc/types.h
+++ b/include/asm-powerpc/types.h
@@ -84,6 +84,13 @@ typedef unsigned long long u64;
typedef __vector128 vector128;
+/* Physical address used by some IO functions */
+#if defined(CONFIG_PPC64) || defined(CONFIG_PHYS_64BIT)
+typedef u64 phys_addr_t;
+#else
+typedef u32 phys_addr_t;
+#endif
+
#ifdef __powerpc64__
typedef u64 dma_addr_t;
#else