Commit:     0aeafb0cef401807fe7d2a50f298203659b668af
Parent:     2abb7019e2877e7f9b1d2432f5a5c36caca5ed1c
Author:     David Gibson <[EMAIL PROTECTED]>
AuthorDate: Fri May 4 16:47:51 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Mon May 7 20:31:14 2007 +1000

    [POWERPC] Kill off the PTE_FMT macro
    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 <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
 include/asm-powerpc/page_32.h       |    2 --
 include/asm-powerpc/pgtable-ppc32.h |    3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/asm-powerpc/page_32.h b/include/asm-powerpc/page_32.h
index 07f6d3c..374d0db 100644
--- a/include/asm-powerpc/page_32.h
+++ b/include/asm-powerpc/page_32.h
@@ -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"
 typedef unsigned long pte_basic_t;
 #define PTE_SHIFT      (PAGE_SHIFT - 2)        /* 1024 ptes per page */
-#define PTE_FMT                "%.8lx"
 struct page;
diff --git a/include/asm-powerpc/pgtable-ppc32.h 
index 80c7547..e704640 100644
--- a/include/asm-powerpc/pgtable-ppc32.h
+++ b/include/asm-powerpc/pgtable-ppc32.h
@@ -101,7 +101,8 @@ extern unsigned long ioremap_bot, ioremap_base;
 #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) \
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to