1 files changed, 7 insertions, 6 deletions

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 295be1d07b8..17c0a6138a5 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -135,7 +135,7 @@ static __init void *spp_getpage(void)
         return ptr;
 }
 
-static void
+static __init void
 set_pte_phys(unsigned long vaddr, unsigned long phys, pgprot_t prot)
 {
         pgd_t *pgd;
@@ -206,7 +206,7 @@ void __init cleanup_highmap(void)
         pmd_t *last_pmd = pmd + PTRS_PER_PMD;
 
         for (; pmd < last_pmd; pmd++, vaddr += PMD_SIZE) {
-                if (!pmd_present(*pmd))
+                if (pmd_none(*pmd))
                         continue;
                 if (vaddr < (unsigned long) _text || vaddr > end)
                         set_pmd(pmd, __pmd(0));
@@ -214,7 +214,7 @@ void __init cleanup_highmap(void)
 }
 
 /* NOTE: this is meant to be run only at boot */
-void __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot)
+void __init __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot)
 {
         unsigned long address = __fix_to_virt(idx);
 
@@ -506,7 +506,7 @@ early_param("memtest", parse_memtest);
 
 static void __init early_memtest(unsigned long start, unsigned long end)
 {
-        unsigned long t_start, t_size;
+        u64 t_start, t_size;
         unsigned pattern;
 
         if (!memtest_pattern)
@@ -525,8 +525,9 @@ static void __init early_memtest(unsigned long start, unsigned long end)
                         if (t_start + t_size > end)
                                 t_size = end - t_start;
 
-                        printk(KERN_CONT "\n  %016lx - %016lx pattern %d",
-                                t_start, t_start + t_size, pattern);
+                        printk(KERN_CONT "\n  %016llx - %016llx pattern %d",
+                                (unsigned long long)t_start,
+                                (unsigned long long)t_start + t_size, pattern);
 
                         memtest(t_start, t_size, pattern);