redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

[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>
wifi-calibration
Kumar Gala 2008-04-16 05:52:27 +10:00 committed by Paul Mackerras
parent 4846c5deb9
commit d04ceb3fc2
7 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/asm-powerpc/mmu-40x.h
View File

@ -53,8 +53,6 @@
#ifndef __ASSEMBLY__
typedef unsigned long phys_addr_t;
typedef struct {
unsigned long id;
unsigned long vdso_base;

2
include/asm-powerpc/mmu-44x.h
View File

@ -53,8 +53,6 @@
#ifndef __ASSEMBLY__
typedef unsigned long long phys_addr_t;
typedef struct {
unsigned long id;
unsigned long vdso_base;

2
include/asm-powerpc/mmu-8xx.h
View File

@ -136,8 +136,6 @@
#define SPRN_M_TW 799
#ifndef __ASSEMBLY__
typedef unsigned long phys_addr_t;
typedef struct {
unsigned long id;
unsigned long vdso_base;

6
include/asm-powerpc/mmu-fsl-booke.h
View File

@ -73,12 +73,6 @@
#ifndef __ASSEMBLY__
#ifndef CONFIG_PHYS_64BIT
typedef unsigned long phys_addr_t;
#else
typedef unsigned long long phys_addr_t;
#endif
typedef struct {
unsigned long id;
unsigned long vdso_base;

2
include/asm-powerpc/mmu-hash32.h
View File

@ -84,8 +84,6 @@ typedef struct {
unsigned long vdso_base;
} mm_context_t;
typedef unsigned long phys_addr_t;
#endif /* !__ASSEMBLY__ */
#endif /* _ASM_POWERPC_MMU_HASH32_H_ */

3
include/asm-powerpc/mmu-hash64.h
View File

@ -469,9 +469,6 @@ static inline unsigned long get_vsid(unsigned long context, unsigned long ea,
VSID_MODULUS_256M)
#define KERNEL_VSID(ea) VSID_SCRAMBLE(GET_ESID(ea))
/* Physical address used by some IO functions */
typedef unsigned long phys_addr_t;
#endif /* __ASSEMBLY__ */
#endif /* _ASM_POWERPC_MMU_HASH64_H_ */

7
include/asm-powerpc/types.h
View File

@ -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