1 files changed, 19 insertions, 23 deletions

diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index f6ff57b7efa5..f11729fd019c 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -209,9 +209,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;
 
@@ -314,9 +313,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);
 
@@ -325,8 +324,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;
@@ -360,14 +359,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;
 }
@@ -491,9 +490,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;
@@ -554,12 +552,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;
@@ -591,12 +588,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)) |
@@ -614,11 +610,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;
                 }