]> err.no Git - linux-2.6/commitdiff
[POWERPC] Abolish PHYS_FMT macro from arch/powerpc
authorDavid Gibson <david@gibson.dropbear.id.au>
Tue, 24 Apr 2007 05:05:18 +0000 (15:05 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 24 Apr 2007 12:11:16 +0000 (22:11 +1000)
32-bit powerpc systems define a macro, PHYS_FMT, giving a printf
format string fragment for displaying physical addresses, since most
32-bit powerpc platforms use 32-bit physical addresses but a few use
64-bit physical addresses.

This macro is used in exactly one place, a rare error message, where
we can solve the problem more simply by just unconditionally casting
the address up to 64-bit quantity before formatting it.

This patch does so, meaning that as we bring MMU definitions from
asm-ppc over to asm-powerpc, cleaning them up in the process, we don't
need to implement this ugly macro (which additionally has a very bad
name for something global).

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/mm/pgtable_32.c

index 8a2fc16ee0a7564cbc2a794f17bb070e69e07b49..bca56037492732f258c8fa6603843b1102f51b0c 100644 (file)
@@ -183,8 +183,8 @@ __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
         * mem_init() sets high_memory so only do the check after that.
         */
        if (mem_init_done && (p < virt_to_phys(high_memory))) {
-               printk("__ioremap(): phys addr "PHYS_FMT" is RAM lr %p\n", p,
-                      __builtin_return_address(0));
+               printk("__ioremap(): phys addr 0x%llx is RAM lr %p\n",
+                      (unsigned long long)p, __builtin_return_address(0));
                return NULL;
        }