[POWERPC] Kill off the PTE_FMT macro (0aeafb0c) · Commits · 戴 / test

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@gibson.dropbear.id.au> Signed-off-by:

Paul Mackerras <paulus@samba.org>

include/asm-powerpc/page_32.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -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;

include/asm-powerpc/pgtable-ppc32.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -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) \

Admin message