Merge branch 'linus' into x86/pat

2 files changed, 3 insertions, 13 deletions

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index de236e419cb5..ec30d10154b6 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -438,8 +438,6 @@ void zap_low_mappings(void)
 {
         int i;
 
-        save_pg_dir();
-
         /*
          * Zap initial low-memory mappings.
          *
@@ -663,16 +661,8 @@ void __init mem_init(void)
                 test_wp_bit();
 
         cpa_init();
-
-        /*
-         * Subtle. SMP is doing it's boot stuff late (because it has to
-         * fork idle threads) - but it also needs low mappings for the
-         * protected-mode entry to work. We zap these entries only after
-         * the WP-bit has been tested.
-         */
-#ifndef CONFIG_SMP
+        save_pg_dir();
         zap_low_mappings();
-#endif
 }
 
 #ifdef CONFIG_MEMORY_HOTPLUG
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index 1a82f4db8a46..c0d5680d5f3c 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -568,7 +568,7 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn,
                 "%s:%d /dev/mem ioremap_change_attr failed %s for %Lx-%Lx\n",
                         current->comm, current->pid,
                         cattr_name(flags),
-                        offset, offset + size);
+                        offset, (unsigned long long)(offset + size));
                 return 0;
         }
 
@@ -589,7 +589,7 @@ void map_devmem(unsigned long pfn, unsigned long size, pgprot_t vma_prot)
                 "%s:%d /dev/mem expected mapping type %s for %Lx-%Lx, got %s\n",
                         current->comm, current->pid,
                         cattr_name(want_flags),
-                        addr, addr + size,
+                        addr, (unsigned long long)(addr + size),
                         cattr_name(flags));
         }
 }