Commit d04ceb3f authored by Kumar Gala's avatar Kumar Gala Committed by Paul Mackerras
Browse files

[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: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 4846c5de

include/asm-powerpc/mmu-40x.h

+0 −2
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ 


#ifndef __ASSEMBLY__



typedef unsigned long phys_addr_t;



typedef struct {

	unsigned long id;

	unsigned long vdso_base;

include/asm-powerpc/mmu-44x.h

+0 −2
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ 


#ifndef __ASSEMBLY__



typedef unsigned long long phys_addr_t;



typedef struct {

	unsigned long id;

	unsigned long vdso_base;

include/asm-powerpc/mmu-8xx.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

include/asm-powerpc/mmu-fsl-booke.h

+0 −6
Original line number Diff line number Diff line
@@ -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;

include/asm-powerpc/mmu-hash32.h

+0 −2
Original line number Diff line number Diff line
@@ -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_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE