Merge branch 'x86/trampoline' into x86/urgent

x86/trampoline contains an urgent commit which is necessarily on a
newer baseline.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

5 files changed, 49 insertions, 50 deletions

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 319b6f2fb8b9..97141c26a13a 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -84,8 +84,9 @@ static void __init find_early_table_space(struct map_range *mr, unsigned long en
         pgt_buf_end = pgt_buf_start;
         pgt_buf_top = pgt_buf_start + (tables >> PAGE_SHIFT);
 
-        printk(KERN_DEBUG "kernel direct mapping tables up to %lx @ %lx-%lx\n",
-                end, pgt_buf_start << PAGE_SHIFT, pgt_buf_top << PAGE_SHIFT);
+        printk(KERN_DEBUG "kernel direct mapping tables up to %#lx @ [mem %#010lx-%#010lx]\n",
+                end - 1, pgt_buf_start << PAGE_SHIFT,
+                (pgt_buf_top << PAGE_SHIFT) - 1);
 }
 
 void __init native_pagetable_reserve(u64 start, u64 end)
@@ -132,7 +133,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
         int nr_range, i;
         int use_pse, use_gbpages;
 
-        printk(KERN_INFO "init_memory_mapping: %016lx-%016lx\n", start, end);
+        printk(KERN_INFO "init_memory_mapping: [mem %#010lx-%#010lx]\n",
+               start, end - 1);
 
 #if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_KMEMCHECK)
         /*
@@ -251,8 +253,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
         }
 
         for (i = 0; i < nr_range; i++)
-                printk(KERN_DEBUG " %010lx - %010lx page %s\n",
-                                mr[i].start, mr[i].end,
+                printk(KERN_DEBUG " [mem %#010lx-%#010lx] page %s\n",
+                                mr[i].start, mr[i].end - 1,
                         (mr[i].page_size_mask & (1<<PG_LEVEL_1G))?"1G":(
                          (mr[i].page_size_mask & (1<<PG_LEVEL_2M))?"2M":"4k"));
 
@@ -350,8 +352,8 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
          * create a kernel page fault:
          */
 #ifdef CONFIG_DEBUG_PAGEALLOC
-        printk(KERN_INFO "debug: unmapping init memory %08lx..%08lx\n",
-                begin, end);
+        printk(KERN_INFO "debug: unmapping init [mem %#010lx-%#010lx]\n",
+                begin, end - 1);
         set_memory_np(begin, (end - begin) >> PAGE_SHIFT);
 #else
         /*
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 19d3fa08b119..2d125be1bae9 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -141,8 +141,8 @@ static int __init numa_add_memblk_to(int nid, u64 start, u64 end,
 
         /* whine about and ignore invalid blks */
         if (start > end || nid < 0 || nid >= MAX_NUMNODES) {
-                pr_warning("NUMA: Warning: invalid memblk node %d (%Lx-%Lx)\n",
-                           nid, start, end);
+                pr_warning("NUMA: Warning: invalid memblk node %d [mem %#010Lx-%#010Lx]\n",
+                           nid, start, end - 1);
                 return 0;
         }
 
@@ -210,8 +210,8 @@ static void __init setup_node_data(int nid, u64 start, u64 end)
 
         start = roundup(start, ZONE_ALIGN);
 
-        printk(KERN_INFO "Initmem setup node %d %016Lx-%016Lx\n",
-               nid, start, end);
+        printk(KERN_INFO "Initmem setup node %d [mem %#010Lx-%#010Lx]\n",
+               nid, start, end - 1);
 
         /*
          * Allocate node data.  Try remap allocator first, node-local
@@ -232,7 +232,7 @@ static void __init setup_node_data(int nid, u64 start, u64 end)
         }
 
         /* report and initialize */
-        printk(KERN_INFO "  NODE_DATA [%016Lx - %016Lx]%s\n",
+        printk(KERN_INFO "  NODE_DATA [mem %#010Lx-%#010Lx]%s\n",
                nd_pa, nd_pa + nd_size - 1, remapped ? " (remapped)" : "");
         tnid = early_pfn_to_nid(nd_pa >> PAGE_SHIFT);
         if (!remapped && tnid != nid)
@@ -291,14 +291,14 @@ int __init numa_cleanup_meminfo(struct numa_meminfo *mi)
                          */
                         if (bi->end > bj->start && bi->start < bj->end) {
                                 if (bi->nid != bj->nid) {
-                                        pr_err("NUMA: node %d (%Lx-%Lx) overlaps with node %d (%Lx-%Lx)\n",
-                                               bi->nid, bi->start, bi->end,
-                                               bj->nid, bj->start, bj->end);
+                                        pr_err("NUMA: node %d [mem %#010Lx-%#010Lx] overlaps with node %d [mem %#010Lx-%#010Lx]\n",
+                                               bi->nid, bi->start, bi->end - 1,
+                                               bj->nid, bj->start, bj->end - 1);
                                         return -EINVAL;
                                 }
-                                pr_warning("NUMA: Warning: node %d (%Lx-%Lx) overlaps with itself (%Lx-%Lx)\n",
-                                           bi->nid, bi->start, bi->end,
-                                           bj->start, bj->end);
+                                pr_warning("NUMA: Warning: node %d [mem %#010Lx-%#010Lx] overlaps with itself [mem %#010Lx-%#010Lx]\n",
+                                           bi->nid, bi->start, bi->end - 1,
+                                           bj->start, bj->end - 1);
                         }
 
                         /*
@@ -320,9 +320,9 @@ int __init numa_cleanup_meminfo(struct numa_meminfo *mi)
                         }
                         if (k < mi->nr_blks)
                                 continue;
-                        printk(KERN_INFO "NUMA: Node %d [%Lx,%Lx) + [%Lx,%Lx) -> [%Lx,%Lx)\n",
-                               bi->nid, bi->start, bi->end, bj->start, bj->end,
-                               start, end);
+                        printk(KERN_INFO "NUMA: Node %d [mem %#010Lx-%#010Lx] + [mem %#010Lx-%#010Lx] -> [mem %#010Lx-%#010Lx]\n",
+                               bi->nid, bi->start, bi->end - 1, bj->start,
+                               bj->end - 1, start, end - 1);
                         bi->start = start;
                         bi->end = end;
                         numa_remove_memblk_from(j--, mi);
@@ -616,8 +616,8 @@ static int __init dummy_numa_init(void)
 {
         printk(KERN_INFO "%s\n",
                numa_off ? "NUMA turned off" : "No NUMA configuration found");
-        printk(KERN_INFO "Faking a node at %016Lx-%016Lx\n",
-               0LLU, PFN_PHYS(max_pfn));
+        printk(KERN_INFO "Faking a node at [mem %#018Lx-%#018Lx]\n",
+               0LLU, PFN_PHYS(max_pfn) - 1);
 
         node_set(0, numa_nodes_parsed);
         numa_add_memblk(0, 0, PFN_PHYS(max_pfn));
diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c
index 871dd8868170..dbbbb47260cc 100644
--- a/arch/x86/mm/numa_emulation.c
+++ b/arch/x86/mm/numa_emulation.c
@@ -68,8 +68,8 @@ static int __init emu_setup_memblk(struct numa_meminfo *ei,
                 numa_remove_memblk_from(phys_blk, pi);
         }
 
-        printk(KERN_INFO "Faking node %d at %016Lx-%016Lx (%LuMB)\n", nid,
-               eb->start, eb->end, (eb->end - eb->start) >> 20);
+        printk(KERN_INFO "Faking node %d at [mem %#018Lx-%#018Lx] (%LuMB)\n",
+               nid, eb->start, eb->end - 1, (eb->end - eb->start) >> 20);
         return 0;
 }
 
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index bea6e573e02b..3d68ef6d2266 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -225,9 +225,8 @@ static int reserve_ram_pages_type(u64 start, u64 end, unsigned long req_type,
                 page = pfn_to_page(pfn);
                 type = get_page_memtype(page);
                 if (type != -1) {
-                        printk(KERN_INFO "reserve_ram_pages_type failed "
-                                "0x%Lx-0x%Lx, track 0x%lx, req 0x%lx\n",
-                                start, end, type, req_type);
+                        printk(KERN_INFO "reserve_ram_pages_type failed [mem %#010Lx-%#010Lx], track 0x%lx, req 0x%lx\n",
+                                start, end - 1, type, req_type);
                         if (new_type)
                                 *new_type = type;
 
@@ -330,9 +329,9 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
 
         err = rbt_memtype_check_insert(new, new_type);
         if (err) {
-                printk(KERN_INFO "reserve_memtype failed 0x%Lx-0x%Lx, "
-                       "track %s, req %s\n",
-                       start, end, cattr_name(new->type), cattr_name(req_type));
+                printk(KERN_INFO "reserve_memtype failed [mem %#010Lx-%#010Lx], track %s, req %s\n",
+                       start, end - 1,
+                       cattr_name(new->type), cattr_name(req_type));
                 kfree(new);
                 spin_unlock(&memtype_lock);
 
@@ -341,8 +340,8 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
 
         spin_unlock(&memtype_lock);
 
-        dprintk("reserve_memtype added 0x%Lx-0x%Lx, track %s, req %s, ret %s\n",
-                start, end, cattr_name(new->type), cattr_name(req_type),
+        dprintk("reserve_memtype added [mem %#010Lx-%#010Lx], track %s, req %s, ret %s\n",
+                start, end - 1, cattr_name(new->type), cattr_name(req_type),
                 new_type ? cattr_name(*new_type) : "-");
 
         return err;
@@ -376,14 +375,14 @@ int free_memtype(u64 start, u64 end)
         spin_unlock(&memtype_lock);
 
         if (!entry) {
-                printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n",
-                        current->comm, current->pid, start, end);
+                printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
+                       current->comm, current->pid, start, end - 1);
                 return -EINVAL;
         }
 
         kfree(entry);
 
-        dprintk("free_memtype request 0x%Lx-0x%Lx\n", start, end);
+        dprintk("free_memtype request [mem %#010Lx-%#010Lx]\n", start, end - 1);
 
         return 0;
 }
@@ -507,9 +506,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
 
         while (cursor < to) {
                 if (!devmem_is_allowed(pfn)) {
-                        printk(KERN_INFO
-                "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
-                                current->comm, from, to);
+                        printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
+                                current->comm, from, to - 1);
                         return 0;
                 }
                 cursor += PAGE_SIZE;
@@ -570,12 +568,11 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
                                 size;
 
         if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) {
-                printk(KERN_INFO
-                        "%s:%d ioremap_change_attr failed %s "
-                        "for %Lx-%Lx\n",
+                printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
+                        "for [mem %#010Lx-%#010Lx]\n",
                         current->comm, current->pid,
                         cattr_name(flags),
-                        base, (unsigned long long)(base + size));
+                        base, (unsigned long long)(base + size-1));
                 return -EINVAL;
         }
         return 0;
@@ -607,12 +604,11 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
 
                 flags = lookup_memtype(paddr);
                 if (want_flags != flags) {
-                        printk(KERN_WARNING
-                        "%s:%d map pfn RAM range req %s for %Lx-%Lx, got %s\n",
+                        printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
                                 current->comm, current->pid,
                                 cattr_name(want_flags),
                                 (unsigned long long)paddr,
-                                (unsigned long long)(paddr + size),
+                                (unsigned long long)(paddr + size - 1),
                                 cattr_name(flags));
                         *vma_prot = __pgprot((pgprot_val(*vma_prot) &
                                               (~_PAGE_CACHE_MASK)) |
@@ -630,11 +626,11 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
                     !is_new_memtype_allowed(paddr, size, want_flags, flags)) {
                         free_memtype(paddr, paddr + size);
                         printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
-                                " for %Lx-%Lx, got %s\n",
+                                " for [mem %#010Lx-%#010Lx], got %s\n",
                                 current->comm, current->pid,
                                 cattr_name(want_flags),
                                 (unsigned long long)paddr,
-                                (unsigned long long)(paddr + size),
+                                (unsigned long long)(paddr + size - 1),
                                 cattr_name(flags));
                         return -EINVAL;
                 }
diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c
index efb5b4b93711..732af3a96183 100644
--- a/arch/x86/mm/srat.c
+++ b/arch/x86/mm/srat.c
@@ -176,8 +176,9 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
                 return;
         }
 
-        printk(KERN_INFO "SRAT: Node %u PXM %u %Lx-%Lx\n", node, pxm,
-               start, end);
+        printk(KERN_INFO "SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]\n",
+               node, pxm,
+               (unsigned long long) start, (unsigned long long) end - 1);
 }
 
 void __init acpi_numa_arch_fixup(void) {}