From 58e528393eecf6fc4fab31aa0d68eb4e5d4680e5 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 4 May 2007 16:47:51 +1000 Subject: [PATCH] --- yaml --- r: 55027 b: refs/heads/master c: 0aeafb0cef401807fe7d2a50f298203659b668af h: refs/heads/master i: 55025: f8d1f305e48517f63bf8d46c61a61336c45c8233 55023: 505a66ab861084859ac270594cdaeda55b1ea532 v: v3 --- [refs] | 2 +- trunk/include/asm-powerpc/page_32.h | 2 -- trunk/include/asm-powerpc/pgtable-ppc32.h | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 12c160c5f2ce..22af06bf955f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2abb7019e2877e7f9b1d2432f5a5c36caca5ed1c +refs/heads/master: 0aeafb0cef401807fe7d2a50f298203659b668af diff --git a/trunk/include/asm-powerpc/page_32.h b/trunk/include/asm-powerpc/page_32.h index 07f6d3cf5e5a..374d0db37e1c 100644 --- a/trunk/include/asm-powerpc/page_32.h +++ b/trunk/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" #else typedef unsigned long pte_basic_t; #define PTE_SHIFT (PAGE_SHIFT - 2) /* 1024 ptes per page */ -#define PTE_FMT "%.8lx" #endif struct page; diff --git a/trunk/include/asm-powerpc/pgtable-ppc32.h b/trunk/include/asm-powerpc/pgtable-ppc32.h index 80c75474c65b..e704640b3e48 100644 --- a/trunk/include/asm-powerpc/pgtable-ppc32.h +++ b/trunk/include/asm-powerpc/pgtable-ppc32.h @@ -101,7 +101,8 @@ extern unsigned long ioremap_bot, ioremap_base; #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) \