5 files changed, 32 insertions, 36 deletions

diff --git a/arch/microblaze/mm/consistent.c b/arch/microblaze/mm/consistent.c
index a1e2e18e0961..5226b09cbbb2 100644
--- a/arch/microblaze/mm/consistent.c
+++ b/arch/microblaze/mm/consistent.c
@@ -13,7 +13,7 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
@@ -37,7 +37,7 @@
 #include <asm/pgalloc.h>
 #include <linux/io.h>
 #include <linux/hardirq.h>
-#include <asm/mmu_context.h>
+#include <linux/mmu_context.h>
 #include <asm/mmu.h>
 #include <linux/uaccess.h>
 #include <asm/pgtable.h>
@@ -102,8 +102,7 @@ void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle)
 # endif
         if ((unsigned int)ret > cpuinfo.dcache_base &&
                                 (unsigned int)ret < cpuinfo.dcache_high)
-                printk(KERN_WARNING
-                        "ERROR: Your cache coherent area is CACHED!!!\n");
+                pr_warn("ERROR: Your cache coherent area is CACHED!!!\n");
 
         /* dma_handle is same as physical (shadowed) address */
         *dma_handle = (dma_addr_t)ret;
diff --git a/arch/microblaze/mm/fault.c b/arch/microblaze/mm/fault.c
index 714b35a9c4f7..731f739d17a1 100644
--- a/arch/microblaze/mm/fault.c
+++ b/arch/microblaze/mm/fault.c
@@ -32,7 +32,7 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/mmu.h>
-#include <asm/mmu_context.h>
+#include <linux/mmu_context.h>
 #include <linux/uaccess.h>
 #include <asm/exceptions.h>
 
@@ -100,7 +100,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long address,
 
         /* On a kernel SLB miss we can only check for a valid exception entry */
         if (unlikely(kernel_mode(regs) && (address >= TASK_SIZE))) {
-                printk(KERN_WARNING "kernel task_size exceed");
+                pr_warn("kernel task_size exceed");
                 _exception(SIGSEGV, regs, code, address);
         }
 
@@ -114,9 +114,9 @@ void do_page_fault(struct pt_regs *regs, unsigned long address,
 
                 /* in_atomic() in user mode is really bad,
                    as is current->mm == NULL. */
-                printk(KERN_EMERG "Page fault in user mode with "
-                       "in_atomic(), mm = %p\n", mm);
-                printk(KERN_EMERG "r15 = %lx  MSR = %lx\n",
+                pr_emerg("Page fault in user mode with in_atomic(), mm = %p\n",
+                                                                        mm);
+                pr_emerg("r15 = %lx  MSR = %lx\n",
                        regs->r15, regs->msr);
                 die("Weird page fault", regs, SIGSEGV);
         }
diff --git a/arch/microblaze/mm/highmem.c b/arch/microblaze/mm/highmem.c
index 7d78838e8bfa..5a92576fad92 100644
--- a/arch/microblaze/mm/highmem.c
+++ b/arch/microblaze/mm/highmem.c
@@ -20,8 +20,8 @@
  * highmem.h by Benjamin Herrenschmidt (c) 2009 IBM Corp.
  */
 
+#include <linux/export.h>
 #include <linux/highmem.h>
-#include <linux/module.h>
 
 /*
  * The use of kmap_atomic/kunmap_atomic is discouraged - kmap/kunmap
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index ce80823051ba..8f8b367c079e 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -89,7 +89,7 @@ static unsigned long highmem_setup(void)
                 reservedpages++;
         }
         totalram_pages += totalhigh_pages;
-        printk(KERN_INFO "High memory: %luk\n",
+        pr_info("High memory: %luk\n",
                                         totalhigh_pages << (PAGE_SHIFT-10));
 
         return reservedpages;
@@ -142,8 +142,8 @@ void __init setup_memory(void)
                         ((u32)_text <= (memory_start + lowmem_size - 1))) {
                         memory_size = lowmem_size;
                         PAGE_OFFSET = memory_start;
-                        printk(KERN_INFO "%s: Main mem: 0x%x, "
-                                "size 0x%08x\n", __func__, (u32) memory_start,
+                        pr_info("%s: Main mem: 0x%x, size 0x%08x\n",
+                                __func__, (u32) memory_start,
                                         (u32) memory_size);
                         break;
                 }
@@ -158,7 +158,7 @@ void __init setup_memory(void)
         kernel_align_start = PAGE_DOWN((u32)_text);
         /* ALIGN can be remove because _end in vmlinux.lds.S is align */
         kernel_align_size = PAGE_UP((u32)klimit) - kernel_align_start;
-        printk(KERN_INFO "%s: kernel addr:0x%08x-0x%08x size=0x%08x\n",
+        pr_info("%s: kernel addr:0x%08x-0x%08x size=0x%08x\n",
                 __func__, kernel_align_start, kernel_align_start
                         + kernel_align_size, kernel_align_size);
         memblock_reserve(kernel_align_start, kernel_align_size);
@@ -181,10 +181,10 @@ void __init setup_memory(void)
         max_low_pfn = ((u64)memory_start + (u64)lowmem_size) >> PAGE_SHIFT;
         max_pfn = ((u64)memory_start + (u64)memory_size) >> PAGE_SHIFT;
 
-        printk(KERN_INFO "%s: max_mapnr: %#lx\n", __func__, max_mapnr);
-        printk(KERN_INFO "%s: min_low_pfn: %#lx\n", __func__, min_low_pfn);
-        printk(KERN_INFO "%s: max_low_pfn: %#lx\n", __func__, max_low_pfn);
-        printk(KERN_INFO "%s: max_pfn: %#lx\n", __func__, max_pfn);
+        pr_info("%s: max_mapnr: %#lx\n", __func__, max_mapnr);
+        pr_info("%s: min_low_pfn: %#lx\n", __func__, min_low_pfn);
+        pr_info("%s: max_low_pfn: %#lx\n", __func__, max_low_pfn);
+        pr_info("%s: max_pfn: %#lx\n", __func__, max_pfn);
 
         /*
          * Find an area to use for the bootmem bitmap.
@@ -246,7 +246,7 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
                 free_page(addr);
                 totalram_pages++;
         }
-        printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
+        pr_info("Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -260,7 +260,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
                 totalram_pages++;
                 pages++;
         }
-        printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n",
+        pr_notice("Freeing initrd memory: %dk freed\n",
                                         (int)(pages * (PAGE_SIZE / 1024)));
 }
 #endif
@@ -304,11 +304,11 @@ void __init mem_init(void)
         initsize = (unsigned long)&__init_end - (unsigned long)&__init_begin;
         bsssize = (unsigned long)&__bss_stop - (unsigned long)&__bss_start;
 
-        pr_info("Memory: %luk/%luk available (%luk kernel code, "
-                "%luk reserved, %luk data, %luk bss, %luk init)\n",
+        pr_info("Memory: %luk/%luk available (%luk kernel code, ",
                 nr_free_pages() << (PAGE_SHIFT-10),
                 num_physpages << (PAGE_SHIFT-10),
-                codesize >> 10,
+                codesize >> 10);
+        pr_cont("%luk reserved, %luk data, %luk bss, %luk init)\n",
                 reservedpages << (PAGE_SHIFT-10),
                 datasize >> 10,
                 bsssize >> 10,
@@ -394,17 +394,17 @@ asmlinkage void __init mmu_init(void)
         unsigned int kstart, ksize;
 
         if (!memblock.reserved.cnt) {
-                printk(KERN_EMERG "Error memory count\n");
+                pr_emerg("Error memory count\n");
                 machine_restart(NULL);
         }
 
         if ((u32) memblock.memory.regions[0].size < 0x400000) {
-                printk(KERN_EMERG "Memory must be greater than 4MB\n");
+                pr_emerg("Memory must be greater than 4MB\n");
                 machine_restart(NULL);
         }
 
         if ((u32) memblock.memory.regions[0].size < kernel_tlb) {
-                printk(KERN_EMERG "Kernel size is greater than memory node\n");
+                pr_emerg("Kernel size is greater than memory node\n");
                 machine_restart(NULL);
         }
 
diff --git a/arch/microblaze/mm/pgtable.c b/arch/microblaze/mm/pgtable.c
index d1c06d07fed8..10b3bd0a980d 100644
--- a/arch/microblaze/mm/pgtable.c
+++ b/arch/microblaze/mm/pgtable.c
@@ -26,8 +26,8 @@
  *
  */
 
+#include <linux/export.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/vmalloc.h>
 #include <linux/init.h>
@@ -39,8 +39,6 @@
 #include <asm/sections.h>
 #include <asm/fixmap.h>
 
-#define flush_HPTE(X, va, pg)   _tlbie(va)
-
 unsigned long ioremap_base;
 unsigned long ioremap_bot;
 EXPORT_SYMBOL(ioremap_bot);
@@ -75,9 +73,8 @@ static void __iomem *__ioremap(phys_addr_t addr, unsigned long size,
                 p >= memory_start && p < virt_to_phys(high_memory) &&
                 !(p >= virt_to_phys((unsigned long)&__bss_stop) &&
                 p < virt_to_phys((unsigned long)__bss_stop))) {
-                printk(KERN_WARNING "__ioremap(): phys addr "PTE_FMT
-                        " is RAM lr %pf\n", (unsigned long)p,
-                        __builtin_return_address(0));
+                pr_warn("__ioremap(): phys addr "PTE_FMT" is RAM lr %pf\n",
+                        (unsigned long)p, __builtin_return_address(0));
                 return NULL;
         }
 
@@ -128,9 +125,10 @@ void __iomem *ioremap(phys_addr_t addr, unsigned long size)
 }
 EXPORT_SYMBOL(ioremap);
 
-void iounmap(void *addr)
+void iounmap(void __iomem *addr)
 {
-        if (addr > high_memory && (unsigned long) addr < ioremap_bot)
+        if ((__force void *)addr > high_memory &&
+                                        (unsigned long) addr < ioremap_bot)
                 vfree((void *) (PAGE_MASK & (unsigned long) addr));
 }
 EXPORT_SYMBOL(iounmap);
@@ -152,8 +150,7 @@ int map_page(unsigned long va, phys_addr_t pa, int flags)
                 set_pte_at(&init_mm, va, pg, pfn_pte(pa >> PAGE_SHIFT,
                                 __pgprot(flags)));
                 if (unlikely(mem_init_done))
-                        flush_HPTE(0, va, pmd_val(*pd));
-                        /* flush_HPTE(0, va, pg); */
+                        _tlbie(va);
         }
         return err;
 }