ARM: 6674/1: LPAE: use long long format when printing physical addresses and ptes

[Frank Li]Fix mx6 boot failure issue during cherry-pick

For the Kernel to support 2 level and 3 level page tables, physical
addresses (and also page table entries) need to be 32 or 64-bits depending
upon the configuration.

This patch uses the %08llx conversion specifier for physical addresses
and page table entries, ensuring that they are cast to (long long) so
that common code can be used regardless of the datatype widths.

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index a1ee7e80d8542741f3b4996aaa56bde578b107dc..594d677b92c883c25c4d5051bcc635394984b6f6 100644 (file)
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -609,7 +609,7 @@ static void __init create_36bit_mapping(struct map_desc *md,
        if (!(cpu_architecture() >= CPU_ARCH_ARMv6 || cpu_is_xsc3())) {
                printk(KERN_ERR "MM: CPU does not support supersection "
                       "mapping for 0x%08llx at 0x%08lx\n",
-                      (uint64_t) __pfn_to_phys((u64)md->pfn), addr);
+                      (long long)__pfn_to_phys((u64)md->pfn), addr);
                return;
        }
 
@@ -622,14 +622,14 @@ static void __init create_36bit_mapping(struct map_desc *md,
        if (type->domain) {
                printk(KERN_ERR "MM: invalid domain in supersection "
                       "mapping for 0x%08llx at 0x%08lx\n",
-                      (uint64_t) __pfn_to_phys((u64)md->pfn), addr);
+                      (long long)__pfn_to_phys((u64)md->pfn), addr);
                return;
        }
 
        if ((addr | length | __pfn_to_phys(md->pfn)) & ~SUPERSECTION_MASK) {
-               printk(KERN_ERR "MM: cannot create mapping for "
-                      "0x%08llx at 0x%08lx invalid alignment\n",
-                      (uint64_t) __pfn_to_phys((u64)md->pfn), addr);
+               printk(KERN_ERR "MM: cannot create mapping for 0x%08llx"
+                      " at 0x%08lx invalid alignment\n",
+                      (long long)__pfn_to_phys((u64)md->pfn), addr);
                return;
        }
 
@@ -670,17 +670,17 @@ static void __init create_mapping(struct map_desc *md)
        pgd_t *pgd;
 
        if (md->virtual != vectors_base() && md->virtual < TASK_SIZE) {
-               printk(KERN_WARNING "BUG: not creating mapping for "
-                      "0x%08llx at 0x%08lx in user region\n",
-                      (uint64_t) __pfn_to_phys((u64)md->pfn), md->virtual);
+               printk(KERN_WARNING "BUG: not creating mapping for 0x%08llx"
+                      " at 0x%08lx in user region\n",
+                      (long long)__pfn_to_phys((u64)md->pfn), md->virtual);
                return;
        }
 
        if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
            md->virtual >= PAGE_OFFSET && md->virtual < VMALLOC_END) {
-               printk(KERN_WARNING "BUG: mapping for 0x%08llx at 0x%08lx "
-                      "overlaps vmalloc space\n",
-                      (uint64_t) __pfn_to_phys((u64)md->pfn), md->virtual);
+               printk(KERN_WARNING "BUG: mapping for 0x%08llx"
+                      " at 0x%08lx overlaps vmalloc space\n",
+                      (long long)__pfn_to_phys((u64)md->pfn), md->virtual);
        }
 
        type = &mem_types[md->type];
@@ -700,7 +700,7 @@ static void __init create_mapping(struct map_desc *md)
        if (type->prot_l1 == 0 && ((addr | phys | length) & ~SECTION_MASK)) {
                printk(KERN_WARNING "BUG: map for 0x%08llx at 0x%08lx can not "
                       "be mapped using pages, ignoring.\n",
-                      (uint64_t) __pfn_to_phys(md->pfn), addr);
+                      (long long)__pfn_to_phys(md->pfn), addr);
                return;
        }