powerpc: Kill off the PTE_FMT macro
David Gibson
david at gibson.dropbear.id.au
Fri May 4 16:47:51 EST 2007
32-bit powerpc uses a PTE_FMT macro to handle printk() formatting of
PTE entries (which can vary in type and size). Apparently there was a
good reason for it once, but with current compilers it's simpler just
to workaround the variation with a cast in the printk() itself
(there's only one use).
Signed-off-by: David Gibson <david at gibson.dropbear.id.au>
---
include/asm-powerpc/page_32.h | 2 --
include/asm-powerpc/pgtable-ppc32.h | 3 ++-
2 files changed, 2 insertions(+), 3 deletions(-)
Index: working-2.6/include/asm-powerpc/page_32.h
===================================================================
--- working-2.6.orig/include/asm-powerpc/page_32.h 2007-01-24 12:01:20.000000000 +1100
+++ working-2.6/include/asm-powerpc/page_32.h 2007-05-04 16:42:24.000000000 +1000
@@ -14,11 +14,9 @@
#ifdef CONFIG_PTE_64BIT
typedef unsigned long long pte_basic_t;
#define PTE_SHIFT (PAGE_SHIFT - 3) /* 512 ptes per page */
-#define PTE_FMT "%16Lx"
#else
typedef unsigned long pte_basic_t;
#define PTE_SHIFT (PAGE_SHIFT - 2) /* 1024 ptes per page */
-#define PTE_FMT "%.8lx"
#endif
struct page;
Index: working-2.6/include/asm-powerpc/pgtable-ppc32.h
===================================================================
--- working-2.6.orig/include/asm-powerpc/pgtable-ppc32.h 2007-05-03 10:19:32.000000000 +1000
+++ working-2.6/include/asm-powerpc/pgtable-ppc32.h 2007-05-04 16:42:24.000000000 +1000
@@ -101,7 +101,8 @@ extern unsigned long ioremap_bot, iorema
#define KERNEL_PGD_PTRS (PTRS_PER_PGD-USER_PGD_PTRS)
#define pte_ERROR(e) \
- printk("%s:%d: bad pte "PTE_FMT".\n", __FILE__, __LINE__, pte_val(e))
+ printk("%s:%d: bad pte %llx.\n", __FILE__, __LINE__, \
+ (unsigned long long)pte_val(e))
#define pmd_ERROR(e) \
printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))
#define pgd_ERROR(e) \
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
More information about the Linuxppc-dev
mailing list