diff options
| author |   Kumar Gala <galak@freescale.com> | 2005-04-16 15:24:21 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:24:21 -0700 |
| commit | a85f6d4aca822acdb49d27c44519cd6514b06a1d (patch) | |
| tree | df39f6f9cfd8017be90ab658196336c69b8de9b5 /include/asm-ppc | |
| parent | [PATCH] ppc32: Fix pte_update for 64-bit PTEs (diff) | |
| download | linux-dev-a85f6d4aca822acdb49d27c44519cd6514b06a1d.tar.xz linux-dev-a85f6d4aca822acdb49d27c44519cd6514b06a1d.zip | |
[PATCH] ppc32: make usage of CONFIG_PTE_64BIT & CONFIG_PHYS_64BIT consistent
CONFIG_PTE_64BIT & CONFIG_PHYS_64BIT are not currently consistently used in
the code base. Fixed up the usage such that CONFIG_PTE_64BIT is used when we
have a 64-bit PTE regardless of physical address width. CONFIG_PHYS_64BIT is
used if the physical address width is larger than 32-bits, regardless of PTE
size.
These changes required a few sub-arch specific ifdef's to be fixed and the
introduction of a physical address format string.
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/mmu.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-ppc/mmu.h b/include/asm-ppc/mmu.h index 4a0c67f672c2..d465aee1c82e 100644 --- a/include/asm-ppc/mmu.h +++ b/include/asm-ppc/mmu.h @@ -15,11 +15,13 @@ * virtual/physical addressing like 32-bit virtual / 36-bit * physical need a larger than native word size type. -Matt */ -#ifndef CONFIG_PTE_64BIT +#ifndef CONFIG_PHYS_64BIT typedef unsigned long phys_addr_t; +#define PHYS_FMT "%.8lx" #else typedef unsigned long long phys_addr_t; extern phys_addr_t fixup_bigphys_addr(phys_addr_t, phys_addr_t); +#define PHYS_FMT "%16Lx" #endif /* Default "unsigned long" context */ |