tree df39f6f9cfd8017be90ab658196336c69b8de9b5
parent 7a1e335085ead05da08f791340f58b493126894d
author Kumar Gala <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:21 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:21 -0700
[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 <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
ppc/mm/pgtable.c | 10 +++++-----
asm-ppc/mmu.h | 4 +++-
2 files changed, 8 insertions(+), 6 deletions(-)
Index: arch/ppc/mm/pgtable.c
===================================================================
--- 5b1a763061d68caef26ec85d55404d868bab7a74/arch/ppc/mm/pgtable.c
(mode:100644 sha1:0a5cd20275c46cbdb7cb1d33085e9ee5b6b2a336)
+++ df39f6f9cfd8017be90ab658196336c69b8de9b5/arch/ppc/mm/pgtable.c
(mode:100644 sha1:5d2f3f66aefa6a695ed19fa9e069f61c03434dc9)
@@ -74,7 +74,7 @@
#define p_mapped_by_tlbcam(x) (0UL)
#endif /* HAVE_TLBCAM */
-#ifdef CONFIG_44x
+#ifdef CONFIG_PTE_64BIT
/* 44x uses an 8kB pgdir because it has 8-byte Linux PTEs. */
#define PGDIR_ORDER 1
#else
@@ -142,13 +142,13 @@
__free_page(ptepage);
}
-#ifndef CONFIG_44x
+#ifndef CONFIG_PHYS_64BIT
void __iomem *
ioremap(phys_addr_t addr, unsigned long size)
{
return __ioremap(addr, size, _PAGE_NO_CACHE);
}
-#else /* CONFIG_44x */
+#else /* CONFIG_PHYS_64BIT */
void __iomem *
ioremap64(unsigned long long addr, unsigned long size)
{
@@ -162,7 +162,7 @@
return ioremap64(addr64, size);
}
-#endif /* CONFIG_44x */
+#endif /* CONFIG_PHYS_64BIT */
void __iomem *
__ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
@@ -193,7 +193,7 @@
*/
if ( mem_init_done && (p < virt_to_phys(high_memory)) )
{
- printk("__ioremap(): phys addr "PTE_FMT" is RAM lr %p\n", p,
+ printk("__ioremap(): phys addr "PHYS_FMT" is RAM lr %p\n", p,
__builtin_return_address(0));
return NULL;
}
Index: include/asm-ppc/mmu.h
===================================================================
--- 5b1a763061d68caef26ec85d55404d868bab7a74/include/asm-ppc/mmu.h
(mode:100644 sha1:4a0c67f672c2c8feb3045553fd26de1627c16e7f)
+++ df39f6f9cfd8017be90ab658196336c69b8de9b5/include/asm-ppc/mmu.h
(mode:100644 sha1:d465aee1c82ea6c554b986c9058e71e2af75b01c)
@@ -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 */
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
