microblaze: Fix coding style issues
Michal Simek [Thu, 27 Dec 2012 09:40:38 +0000 (10:40 +0100)]
Fix coding style issues reported by checkpatch.pl.

Signed-off-by: Michal Simek <monstr@monstr.eu>

32 files changed:
arch/microblaze/include/asm/io.h
arch/microblaze/kernel/cpu/cache.c
arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c
arch/microblaze/kernel/cpu/cpuinfo.c
arch/microblaze/kernel/cpu/pvr.c
arch/microblaze/kernel/dma.c
arch/microblaze/kernel/early_printk.c
arch/microblaze/kernel/exceptions.c
arch/microblaze/kernel/ftrace.c
arch/microblaze/kernel/heartbeat.c
arch/microblaze/kernel/intc.c
arch/microblaze/kernel/kgdb.c
arch/microblaze/kernel/module.c
arch/microblaze/kernel/process.c
arch/microblaze/kernel/ptrace.c
arch/microblaze/kernel/setup.c
arch/microblaze/kernel/signal.c
arch/microblaze/kernel/sys_microblaze.c
arch/microblaze/kernel/traps.c
arch/microblaze/lib/ashldi3.c
arch/microblaze/lib/ashrdi3.c
arch/microblaze/lib/lshrdi3.c
arch/microblaze/lib/memcpy.c
arch/microblaze/lib/memmove.c
arch/microblaze/mm/consistent.c
arch/microblaze/mm/fault.c
arch/microblaze/mm/init.c
arch/microblaze/mm/pgtable.c
arch/microblaze/pci/indirect_pci.c
arch/microblaze/pci/iomap.c
arch/microblaze/pci/pci-common.c
arch/microblaze/pci/xilinx_pci.c

index 4fbfdc1..8cb8a85 100644 (file)
@@ -150,7 +150,7 @@ static inline void writel(unsigned int v, volatile void __iomem *addr)
 #define page_to_bus(page)      (page_to_phys(page))
 #define bus_to_virt(addr)      (phys_to_virt(addr))
 
-extern void iounmap(void *addr);
+extern void iounmap(void __iomem *addr);
 /*extern void *__ioremap(phys_addr_t address, unsigned long size,
                unsigned long flags);*/
 extern void __iomem *ioremap(phys_addr_t address, unsigned long size);
index 4b7d8a3..4254514 100644 (file)
 
 static inline void __enable_icache_msr(void)
 {
-       __asm__ __volatile__ (" msrset  r0, %0;         \
-                               nop; "                  \
+       __asm__ __volatile__ ("  msrset r0, %0;"        \
+                               "nop;"                  \
                        : : "i" (MSR_ICE) : "memory");
 }
 
 static inline void __disable_icache_msr(void)
 {
-       __asm__ __volatile__ (" msrclr  r0, %0;         \
-                               nop; "                  \
+       __asm__ __volatile__ ("  msrclr r0, %0;"        \
+                               "nop;"                  \
                        : : "i" (MSR_ICE) : "memory");
 }
 
 static inline void __enable_dcache_msr(void)
 {
-       __asm__ __volatile__ (" msrset  r0, %0;         \
-                               nop; "                  \
-                               :                       \
-                               : "i" (MSR_DCE)         \
-                               : "memory");
+       __asm__ __volatile__ ("  msrset r0, %0;"        \
+                               "nop;"                  \
+                       : : "i" (MSR_DCE) : "memory");
 }
 
 static inline void __disable_dcache_msr(void)
 {
-       __asm__ __volatile__ (" msrclr  r0, %0;         \
-                               nop; "                  \
-                               :                       \
-                               : "i" (MSR_DCE)         \
-                               : "memory");
+       __asm__ __volatile__ ("  msrclr r0, %0;"        \
+                               "nop; "                 \
+                       : : "i" (MSR_DCE) : "memory");
 }
 
 static inline void __enable_icache_nomsr(void)
 {
-       __asm__ __volatile__ (" mfs     r12, rmsr;      \
-                               nop;                    \
-                               ori     r12, r12, %0;   \
-                               mts     rmsr, r12;      \
-                               nop; "                  \
-                               :                       \
-                               : "i" (MSR_ICE)         \
-                               : "memory", "r12");
+       __asm__ __volatile__ ("  mfs    r12, rmsr;"     \
+                               "nop;"                  \
+                               "ori    r12, r12, %0;"  \
+                               "mts    rmsr, r12;"     \
+                               "nop;"                  \
+                       : : "i" (MSR_ICE) : "memory", "r12");
 }
 
 static inline void __disable_icache_nomsr(void)
 {
-       __asm__ __volatile__ (" mfs     r12, rmsr;      \
-                               nop;                    \
-                               andi    r12, r12, ~%0;  \
-                               mts     rmsr, r12;      \
-                               nop; "                  \
-                               :                       \
-                               : "i" (MSR_ICE)         \
-                               : "memory", "r12");
+       __asm__ __volatile__ ("  mfs    r12, rmsr;"     \
+                               "nop;"                  \
+                               "andi   r12, r12, ~%0;" \
+                               "mts    rmsr, r12;"     \
+                               "nop;"                  \
+                       : : "i" (MSR_ICE) : "memory", "r12");
 }
 
 static inline void __enable_dcache_nomsr(void)
 {
-       __asm__ __volatile__ (" mfs     r12, rmsr;      \
-                               nop;                    \
-                               ori     r12, r12, %0;   \
-                               mts     rmsr, r12;      \
-                               nop; "                  \
-                               :                       \
-                               : "i" (MSR_DCE)         \
-                               : "memory", "r12");
+       __asm__ __volatile__ ("  mfs    r12, rmsr;"     \
+                               "nop;"                  \
+                               "ori    r12, r12, %0;"  \
+                               "mts    rmsr, r12;"     \
+                               "nop;"                  \
+                       : : "i" (MSR_DCE) : "memory", "r12");
 }
 
 static inline void __disable_dcache_nomsr(void)
 {
-       __asm__ __volatile__ (" mfs     r12, rmsr;      \
-                               nop;                    \
-                               andi    r12, r12, ~%0;  \
-                               mts     rmsr, r12;      \
-                               nop; "                  \
-                               :                       \
-                               : "i" (MSR_DCE)         \
-                               : "memory", "r12");
+       __asm__ __volatile__ ("  mfs    r12, rmsr;"     \
+                               "nop;"                  \
+                               "andi   r12, r12, ~%0;" \
+                               "mts    rmsr, r12;"     \
+                               "nop;"                  \
+                       : : "i" (MSR_DCE) : "memory", "r12");
 }
 
 
@@ -106,7 +94,7 @@ do {                                                                 \
        int align = ~(cache_line_length - 1);                           \
        end = min(start + cache_size, end);                             \
        start &= align;                                                 \
-} while (0);
+} while (0)
 
 /*
  * Helper macro to loop over the specified cache_size/line_length and
@@ -118,12 +106,12 @@ do {                                                                      \
        int step = -line_length;                                        \
        WARN_ON(step >= 0);                                             \
                                                                        \
-       __asm__ __volatile__ (" 1:      " #op " %0, r0;                 \
-                                       bgtid   %0, 1b;                 \
-                                       addk    %0, %0, %1;             \
-                                       " : : "r" (len), "r" (step)     \
+       __asm__ __volatile__ (" 1:      " #op " %0, r0;"                \
+                                       "bgtid   %0, 1b;"               \
+                                       "addk    %0, %0, %1;"           \
+                                       : : "r" (len), "r" (step)       \
                                        : "memory");                    \
-} while (0);
+} while (0)
 
 /* Used for wdc.flush/clear which can use rB for offset which is not possible
  * to use for simple wdc or wic.
@@ -142,12 +130,12 @@ do {                                                                      \
        count = end - start;                                            \
        WARN_ON(count < 0);                                             \
                                                                        \
-       __asm__ __volatile__ (" 1:      " #op " %0, %1;                 \
-                                       bgtid   %1, 1b;                 \
-                                       addk    %1, %1, %2;             \
-                                       " : : "r" (start), "r" (count), \
+       __asm__ __volatile__ (" 1:      " #op " %0, %1;"                \
+                                       "bgtid  %1, 1b;"                \
+                                       "addk   %1, %1, %2;"            \
+                                       : : "r" (start), "r" (count),   \
                                        "r" (step) : "memory");         \
-} while (0);
+} while (0)
 
 /* It is used only first parameter for OP - for wic, wdc */
 #define CACHE_RANGE_LOOP_1(start, end, line_length, op)                        \
@@ -157,13 +145,13 @@ do {                                                                      \
        end = ((end & align) == end) ? end - line_length : end & align; \
        WARN_ON(end - start < 0);                                       \
                                                                        \
-       __asm__ __volatile__ (" 1:      " #op " %1, r0;                 \
-                                       cmpu    %0, %1, %2;             \
-                                       bgtid   %0, 1b;                 \
-                                       addk    %1, %1, %3;             \
-                               " : : "r" (temp), "r" (start), "r" (end),\
+       __asm__ __volatile__ (" 1:      " #op " %1, r0;"                \
+                                       "cmpu   %0, %1, %2;"            \
+                                       "bgtid  %0, 1b;"                \
+                                       "addk   %1, %1, %3;"            \
+                               : : "r" (temp), "r" (start), "r" (end), \
                                        "r" (line_length) : "memory");  \
-} while (0);
+} while (0)
 
 #define ASM_LOOP
 
@@ -352,7 +340,7 @@ static void __invalidate_dcache_all_noirq_wt(void)
 #endif
        pr_debug("%s\n", __func__);
 #ifdef ASM_LOOP
-       CACHE_ALL_LOOP(cpuinfo.dcache_size, cpuinfo.dcache_line_length, wdc)
+       CACHE_ALL_LOOP(cpuinfo.dcache_size, cpuinfo.dcache_line_length, wdc);
 #else
        for (i = 0; i < cpuinfo.dcache_size;
                 i += cpuinfo.dcache_line_length)
@@ -361,7 +349,8 @@ static void __invalidate_dcache_all_noirq_wt(void)
 #endif
 }
 
-/* FIXME It is blindly invalidation as is expected
+/*
+ * FIXME It is blindly invalidation as is expected
  * but can't be called on noMMU in microblaze_cache_init below
  *
  * MS: noMMU kernel won't boot if simple wdc is used
@@ -375,7 +364,7 @@ static void __invalidate_dcache_all_wb(void)
        pr_debug("%s\n", __func__);
 #ifdef ASM_LOOP
        CACHE_ALL_LOOP(cpuinfo.dcache_size, cpuinfo.dcache_line_length,
-                                       wdc)
+                                       wdc);
 #else
        for (i = 0; i < cpuinfo.dcache_size;
                 i += cpuinfo.dcache_line_length)
@@ -616,49 +605,48 @@ static const struct scache wt_nomsr_noirq = {
 #define CPUVER_7_20_A  0x0c
 #define CPUVER_7_20_D  0x0f
 
-#define INFO(s)        printk(KERN_INFO "cache: " s "\n");
-
 void microblaze_cache_init(void)
 {
        if (cpuinfo.use_instr & PVR2_USE_MSR_INSTR) {
                if (cpuinfo.dcache_wb) {
-                       INFO("wb_msr");
+                       pr_info("wb_msr\n");
                        mbc = (struct scache *)&wb_msr;
                        if (cpuinfo.ver_code <= CPUVER_7_20_D) {
                                /* MS: problem with signal handling - hw bug */
-                               INFO("WB won't work properly");
+                               pr_info("WB won't work properly\n");
                        }
                } else {
                        if (cpuinfo.ver_code >= CPUVER_7_20_A) {
-                               INFO("wt_msr_noirq");
+                               pr_info("wt_msr_noirq\n");
                                mbc = (struct scache *)&wt_msr_noirq;
                        } else {
-                               INFO("wt_msr");
+                               pr_info("wt_msr\n");
                                mbc = (struct scache *)&wt_msr;
                        }
                }
        } else {
                if (cpuinfo.dcache_wb) {
-                       INFO("wb_nomsr");
+                       pr_info("wb_nomsr\n");
                        mbc = (struct scache *)&wb_nomsr;
                        if (cpuinfo.ver_code <= CPUVER_7_20_D) {
                                /* MS: problem with signal handling - hw bug */
-                               INFO("WB won't work properly");
+                               pr_info("WB won't work properly\n");
                        }
                } else {
                        if (cpuinfo.ver_code >= CPUVER_7_20_A) {
-                               INFO("wt_nomsr_noirq");
+                               pr_info("wt_nomsr_noirq\n");
                                mbc = (struct scache *)&wt_nomsr_noirq;
                        } else {
-                               INFO("wt_nomsr");
+                               pr_info("wt_nomsr\n");
                                mbc = (struct scache *)&wt_nomsr;
                        }
                }
        }
-/* FIXME Invalidation is done in U-BOOT
- * WT cache: Data is already written to main memory
- * WB cache: Discard data on noMMU which caused that kernel doesn't boot
- */
+       /*
+        * FIXME Invalidation is done in U-BOOT
+        * WT cache: Data is already written to main memory
+        * WB cache: Discard data on noMMU which caused that kernel doesn't boot
+        */
        /* invalidate_dcache(); */
        enable_dcache();
 
index 916aaed..ee46894 100644 (file)
@@ -27,7 +27,7 @@
        early_printk("ERROR: Microblaze " x "-different for PVR and DTS\n");
 #else
 #define err_printk(x) \
-       printk(KERN_INFO "ERROR: Microblaze " x "-different for PVR and DTS\n");
+       pr_info("ERROR: Microblaze " x "-different for PVR and DTS\n");
 #endif
 
 void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu)
@@ -38,12 +38,11 @@ void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu)
 
        CI(ver_code, VERSION);
        if (!ci->ver_code) {
-               printk(KERN_ERR "ERROR: MB has broken PVR regs "
-                                               "-> use DTS setting\n");
+               pr_err("ERROR: MB has broken PVR regs -> use DTS setting\n");
                return;
        }
 
-       temp = PVR_USE_BARREL(pvr) | PVR_USE_MSR_INSTR(pvr) |\
+       temp = PVR_USE_BARREL(pvr) | PVR_USE_MSR_INSTR(pvr) |
                PVR_USE_PCMP_INSTR(pvr) | PVR_USE_DIV(pvr);
        if (ci->use_instr != temp)
                err_printk("BARREL, MSR, PCMP or DIV");
@@ -59,13 +58,13 @@ void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu)
                err_printk("HW_FPU");
        ci->use_fpu = temp;
 
-       ci->use_exc = PVR_OPCODE_0x0_ILLEGAL(pvr) |\
-                       PVR_UNALIGNED_EXCEPTION(pvr) |\
-                       PVR_ILL_OPCODE_EXCEPTION(pvr) |\
-                       PVR_IOPB_BUS_EXCEPTION(pvr) |\
-                       PVR_DOPB_BUS_EXCEPTION(pvr) |\
-                       PVR_DIV_ZERO_EXCEPTION(pvr) |\
-                       PVR_FPU_EXCEPTION(pvr) |\
+       ci->use_exc = PVR_OPCODE_0x0_ILLEGAL(pvr) |
+                       PVR_UNALIGNED_EXCEPTION(pvr) |
+                       PVR_ILL_OPCODE_EXCEPTION(pvr) |
+                       PVR_IOPB_BUS_EXCEPTION(pvr) |
+                       PVR_DOPB_BUS_EXCEPTION(pvr) |
+                       PVR_DIV_ZERO_EXCEPTION(pvr) |
+                       PVR_FPU_EXCEPTION(pvr) |
                        PVR_FSL_EXCEPTION(pvr);
 
        CI(pvr_user1, USER1);
index eab6abf..0b2299b 100644 (file)
@@ -68,31 +68,30 @@ void __init setup_cpuinfo(void)
 
        cpu = (struct device_node *) of_find_node_by_type(NULL, "cpu");
        if (!cpu)
-               printk(KERN_ERR "You don't have cpu!!!\n");
+               pr_err("You don't have cpu!!!\n");
 
-       printk(KERN_INFO "%s: initialising\n", __func__);
+       pr_info("%s: initialising\n", __func__);
 
        switch (cpu_has_pvr()) {
        case 0:
-               printk(KERN_WARNING
-                       "%s: No PVR support. Using static CPU info from FDT\n",
+               pr_warn("%s: No PVR support. Using static CPU info from FDT\n",
                        __func__);
                set_cpuinfo_static(&cpuinfo, cpu);
                break;
 /* FIXME I found weird behavior with MB 7.00.a/b 7.10.a
  * please do not use FULL PVR with MMU */
        case 1:
-               printk(KERN_INFO "%s: Using full CPU PVR support\n",
+               pr_info("%s: Using full CPU PVR support\n",
                        __func__);
                set_cpuinfo_static(&cpuinfo, cpu);
                set_cpuinfo_pvr_full(&cpuinfo, cpu);
                break;
        default:
-               printk(KERN_WARNING "%s: Unsupported PVR setting\n", __func__);
+               pr_warn("%s: Unsupported PVR setting\n", __func__);
                set_cpuinfo_static(&cpuinfo, cpu);
        }
 
        if (cpuinfo.mmu_privins)
-               printk(KERN_WARNING "%s: Stream instructions enabled"
+               pr_warn("%s: Stream instructions enabled"
                        " - USERSPACE CAN LOCK THIS KERNEL!\n", __func__);
 }
index 3a749d5..8d0dc6d 100644 (file)
@@ -27,7 +27,7 @@
        tmp = 0x0;      /* Prevent warning about unused */      \
        __asm__ __volatile__ (                                  \
                        "mfs    %0, rpvr" #pvrid ";"            \
-                       : "=r" (tmp) : : "memory");             \
+                       : "=r" (tmp) : : "memory");             \
        val = tmp;                                              \
 }
 
index a2bfa2c..da68d00 100644 (file)
@@ -11,7 +11,7 @@
 #include <linux/gfp.h>
 #include <linux/dma-debug.h>
 #include <linux/export.h>
-#include <asm/bug.h>
+#include <linux/bug.h>
 
 /*
  * Generic direct DMA implementation
@@ -197,8 +197,8 @@ EXPORT_SYMBOL(dma_direct_ops);
 
 static int __init dma_init(void)
 {
-       dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
+       dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
 
-       return 0;
+       return 0;
 }
 fs_initcall(dma_init);
index aba1f9a..60dcacc 100644 (file)
@@ -140,20 +140,20 @@ int __init setup_early_printk(char *opt)
                switch (version) {
 #ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
                case UARTLITE:
-                       printk(KERN_INFO "Early console on uartlite "
-                                               "at 0x%08x\n", base_addr);
+                       pr_info("Early console on uartlite at 0x%08x\n",
+                                                               base_addr);
                        early_console = &early_serial_uartlite_console;
                        break;
 #endif
 #ifdef CONFIG_SERIAL_8250_CONSOLE
                case UART16550:
-                       printk(KERN_INFO "Early console on uart16650 "
-                                               "at 0x%08x\n", base_addr);
+                       pr_info("Early console on uart16650 at 0x%08x\n",
+                                                               base_addr);
                        early_console = &early_serial_uart16550_console;
                        break;
 #endif
                default:
-                       printk(KERN_INFO  "Unsupported early console %d\n",
+                       pr_info("Unsupported early console %d\n",
                                                                version);
                        return 1;
                }
@@ -171,10 +171,9 @@ void __init remap_early_printk(void)
 {
        if (!early_console_initialized || !early_console)
                return;
-       printk(KERN_INFO "early_printk_console remapping from 0x%x to ",
-                                                               base_addr);
+       pr_info("early_printk_console remapping from 0x%x to ", base_addr);
        base_addr = (u32) ioremap(base_addr, PAGE_SIZE);
-       printk(KERN_CONT "0x%x\n", base_addr);
+       pr_cont("0x%x\n", base_addr);
 
 #ifdef CONFIG_MMU
        /*
@@ -197,7 +196,7 @@ void __init disable_early_printk(void)
 {
        if (!early_console_initialized || !early_console)
                return;
-       printk(KERN_WARNING "disabling early console\n");
+       pr_warn("disabling early console\n");
        unregister_console(early_console);
        early_console_initialized = 0;
 }
index 6348dc8..d6edf5d 100644 (file)
@@ -40,7 +40,7 @@ void die(const char *str, struct pt_regs *fp, long err)
 {
        console_verbose();
        spin_lock_irq(&die_lock);
-       printk(KERN_WARNING "Oops: %s, sig: %ld\n", str, err);
+       pr_warn("Oops: %s, sig: %ld\n", str, err);
        show_regs(fp);
        spin_unlock_irq(&die_lock);
        /* do_exit() should take care of panic'ing from an interrupt
@@ -61,9 +61,9 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)
 {
        siginfo_t info;
 
-       if (kernel_mode(regs)) {
+       if (kernel_mode(regs))
                die("Exception in kernel mode", regs, signr);
-       }
+
        info.si_signo = signr;
        info.si_errno = 0;
        info.si_code = code;
@@ -79,8 +79,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
 #endif
 
 #if 0
-       printk(KERN_WARNING "Exception %02x in %s mode, FSR=%08x PC=%08x " \
-                                                       "ESR=%08x\n",
+       pr_warn("Exception %02x in %s mode, FSR=%08x PC=%08x ESR=%08x\n",
                        type, user_mode(regs) ? "user" : "kernel", fsr,
                        (unsigned int) regs->pc, (unsigned int) regs->esr);
 #endif
@@ -92,8 +91,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
                        _exception(SIGILL, regs, ILL_ILLOPC, addr);
                        return;
                }
-               printk(KERN_WARNING "Illegal opcode exception " \
-                                                       "in kernel mode.\n");
+               pr_warn("Illegal opcode exception in kernel mode.\n");
                die("opcode exception", regs, SIGBUS);
                break;
        case MICROBLAZE_IBUS_EXCEPTION:
@@ -102,8 +100,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
                        _exception(SIGBUS, regs, BUS_ADRERR, addr);
                        return;
                }
-               printk(KERN_WARNING "Instruction bus error exception " \
-                                                       "in kernel mode.\n");
+               pr_warn("Instruction bus error exception in kernel mode.\n");
                die("bus exception", regs, SIGBUS);
                break;
        case MICROBLAZE_DBUS_EXCEPTION:
@@ -112,8 +109,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
                        _exception(SIGBUS, regs, BUS_ADRERR, addr);
                        return;
                }
-               printk(KERN_WARNING "Data bus error exception " \
-                                                       "in kernel mode.\n");
+               pr_warn("Data bus error exception in kernel mode.\n");
                die("bus exception", regs, SIGBUS);
                break;
        case MICROBLAZE_DIV_ZERO_EXCEPTION:
@@ -122,8 +118,7 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
                        _exception(SIGFPE, regs, FPE_INTDIV, addr);
                        return;
                }
-               printk(KERN_WARNING "Divide by zero exception " \
-                                                       "in kernel mode.\n");
+               pr_warn("Divide by zero exception in kernel mode.\n");
                die("Divide by zero exception", regs, SIGBUS);
                break;
        case MICROBLAZE_FPU_EXCEPTION:
@@ -151,8 +146,8 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
 #endif
        default:
        /* FIXME what to do in unexpected exception */
-               printk(KERN_WARNING "Unexpected exception %02x "
-                       "PC=%08x in %s mode\n", type, (unsigned int) addr,
+               pr_warn("Unexpected exception %02x PC=%08x in %s mode\n",
+                       type, (unsigned int) addr,
                        kernel_mode(regs) ? "kernel" : "user");
        }
        return;
index 357d56a..e8a5e9c 100644 (file)
@@ -35,18 +35,18 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
         * happen. This tool is too much intrusive to
         * ignore such a protection.
         */
-       asm volatile("  1:      lwi     %0, %2, 0;              \
-                       2:      swi     %3, %2, 0;              \
-                               addik   %1, r0, 0;              \
-                       3:                                      \
-                               .section .fixup, \"ax\";        \
-                       4:      brid    3b;                     \
-                               addik   %1, r0, 1;              \
-                               .previous;                      \
-                               .section __ex_table,\"a\";      \
-                               .word   1b,4b;                  \
-                               .word   2b,4b;                  \
-                               .previous;"                     \
+       asm volatile("  1:      lwi     %0, %2, 0;"             \
+                       "2:     swi     %3, %2, 0;"             \
+                       "       addik   %1, r0, 0;"             \
+                       "3:"                                    \
+                       "       .section .fixup, \"ax\";"       \
+                       "4:     brid    3b;"                    \
+                       "       addik   %1, r0, 1;"             \
+                       "       .previous;"                     \
+                       "       .section __ex_table,\"a\";"     \
+                       "       .word   1b,4b;"                 \
+                       "       .word   2b,4b;"                 \
+                       "       .previous;"                     \
                        : "=&r" (old), "=r" (faulted)
                        : "r" (parent), "r" (return_hooker)
        );
@@ -81,16 +81,16 @@ static int ftrace_modify_code(unsigned long addr, unsigned int value)
 {
        int faulted = 0;
 
-       __asm__ __volatile__("  1:      swi     %2, %1, 0;              \
-                                       addik   %0, r0, 0;              \
-                               2:                                      \
-                                       .section .fixup, \"ax\";        \
-                               3:      brid    2b;                     \
-                                       addik   %0, r0, 1;              \
-                                       .previous;                      \
-                                       .section __ex_table,\"a\";      \
-                                       .word   1b,3b;                  \
-                                       .previous;"                     \
+       __asm__ __volatile__("  1:      swi     %2, %1, 0;"             \
+                               "       addik   %0, r0, 0;"             \
+                               "2:"                                    \
+                               "       .section .fixup, \"ax\";"       \
+                               "3:     brid    2b;"                    \
+                               "       addik   %0, r0, 1;"             \
+                               "       .previous;"                     \
+                               "       .section __ex_table,\"a\";"     \
+                               "       .word   1b,3b;"                 \
+                               "       .previous;"                     \
                                : "=r" (faulted)
                                : "r" (addr), "r" (value)
        );
index 154756f..1879a05 100644 (file)
@@ -61,7 +61,7 @@ void setup_heartbeat(void)
        if (gpio) {
                base_addr = be32_to_cpup(of_get_property(gpio, "reg", NULL));
                base_addr = (unsigned long) ioremap(base_addr, PAGE_SIZE);
-               printk(KERN_NOTICE "Heartbeat GPIO at 0x%x\n", base_addr);
+               pr_notice("Heartbeat GPIO at 0x%x\n", base_addr);
 
                /* GPIO is configured as output */
                prop = (int *) of_get_property(gpio, "xlnx,is-bidir", NULL);
index 7a1a8d4..8778adf 100644 (file)
@@ -147,12 +147,12 @@ void __init init_IRQ(void)
        intr_mask =
                be32_to_cpup(of_get_property(intc, "xlnx,kind-of-intr", NULL));
        if (intr_mask > (u32)((1ULL << nr_irq) - 1))
-               printk(KERN_INFO " ERROR: Mismatch in kind-of-intr param\n");
+               pr_info(" ERROR: Mismatch in kind-of-intr param\n");
 
 #ifdef CONFIG_SELFMOD_INTC
        selfmod_function((int *) arr_func, intc_baseaddr);
 #endif
-       printk(KERN_INFO "%s #0 at 0x%08x, num_irq=%d, edge=0x%x\n",
+       pr_info("%s #0 at 0x%08x, num_irq=%d, edge=0x%x\n",
                intc->name, intc_baseaddr, nr_irq, intr_mask);
 
        /*
index 09a5e82..8adc924 100644 (file)
@@ -141,7 +141,7 @@ void kgdb_arch_exit(void)
 /*
  * Global data
  */
-struct kgdb_arch arch_kgdb_ops = {
+const struct kgdb_arch arch_kgdb_ops = {
 #ifdef __MICROBLAZEEL__
        .gdb_bpt_instr = {0x18, 0x00, 0x0c, 0xba}, /* brki r16, 0x18 */
 #else
index f39257a..f0f4368 100644 (file)
@@ -108,8 +108,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
                        break;
 
                default:
-                       printk(KERN_ERR "module %s: "
-                               "Unknown relocation: %u\n",
+                       pr_err("module %s: Unknown relocation: %u\n",
                                module->name,
                                ELF32_R_TYPE(rela[i].r_info));
                        return -ENOEXEC;
index a5b74f7..282dfb8 100644 (file)
 #include <linux/bitops.h>
 #include <linux/ptrace.h>
 #include <asm/pgalloc.h>
-#include <asm/uaccess.h> /* for USER_DS macros */
+#include <linux/uaccess.h> /* for USER_DS macros */
 #include <asm/cacheflush.h>
 
 void show_regs(struct pt_regs *regs)
 {
-       printk(KERN_INFO " Registers dump: mode=%X\r\n", regs->pt_mode);
-       printk(KERN_INFO " r1=%08lX, r2=%08lX, r3=%08lX, r4=%08lX\n",
+       pr_info(" Registers dump: mode=%X\r\n", regs->pt_mode);
+       pr_info(" r1=%08lX, r2=%08lX, r3=%08lX, r4=%08lX\n",
                                regs->r1, regs->r2, regs->r3, regs->r4);
-       printk(KERN_INFO " r5=%08lX, r6=%08lX, r7=%08lX, r8=%08lX\n",
+       pr_info(" r5=%08lX, r6=%08lX, r7=%08lX, r8=%08lX\n",
                                regs->r5, regs->r6, regs->r7, regs->r8);
-       printk(KERN_INFO " r9=%08lX, r10=%08lX, r11=%08lX, r12=%08lX\n",
+       pr_info(" r9=%08lX, r10=%08lX, r11=%08lX, r12=%08lX\n",
                                regs->r9, regs->r10, regs->r11, regs->r12);
-       printk(KERN_INFO " r13=%08lX, r14=%08lX, r15=%08lX, r16=%08lX\n",
+       pr_info(" r13=%08lX, r14=%08lX, r15=%08lX, r16=%08lX\n",
                                regs->r13, regs->r14, regs->r15, regs->r16);
-       printk(KERN_INFO " r17=%08lX, r18=%08lX, r19=%08lX, r20=%08lX\n",
+       pr_info(" r17=%08lX, r18=%08lX, r19=%08lX, r20=%08lX\n",
                                regs->r17, regs->r18, regs->r19, regs->r20);
-       printk(KERN_INFO " r21=%08lX, r22=%08lX, r23=%08lX, r24=%08lX\n",
+       pr_info(" r21=%08lX, r22=%08lX, r23=%08lX, r24=%08lX\n",
                                regs->r21, regs->r22, regs->r23, regs->r24);
-       printk(KERN_INFO " r25=%08lX, r26=%08lX, r27=%08lX, r28=%08lX\n",
+       pr_info(" r25=%08lX, r26=%08lX, r27=%08lX, r28=%08lX\n",
                                regs->r25, regs->r26, regs->r27, regs->r28);
-       printk(KERN_INFO " r29=%08lX, r30=%08lX, r31=%08lX, rPC=%08lX\n",
+       pr_info(" r29=%08lX, r30=%08lX, r31=%08lX, rPC=%08lX\n",
                                regs->r29, regs->r30, regs->r31, regs->pc);
-       printk(KERN_INFO " msr=%08lX, ear=%08lX, esr=%08lX, fsr=%08lX\n",
+       pr_info(" msr=%08lX, ear=%08lX, esr=%08lX, fsr=%08lX\n",
                                regs->msr, regs->ear, regs->esr, regs->fsr);
 }
 
index ab1b9db..c554980 100644 (file)
@@ -40,7 +40,7 @@
 #include <asm/asm-offsets.h>
 #include <asm/cacheflush.h>
 #include <asm/syscall.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 /* Returns the address where the register at REG_OFFS in P is stashed away. */
 static microblaze_reg_t *reg_save_addr(unsigned reg_offs,
index 686b6ba..0263da7 100644 (file)
@@ -150,33 +150,35 @@ void __init machine_early_init(const char *cmdline, unsigned int ram,
        /* printk("TLB1 0x%08x, TLB0 0x%08x, tlb 0x%x\n", tlb0,
                                                        tlb1, kernel_tlb); */
 
-       printk("Ramdisk addr 0x%08x, ", ram);
+       pr_info("Ramdisk addr 0x%08x, ", ram);
        if (fdt)
-               printk("FDT at 0x%08x\n", fdt);
+               pr_info("FDT at 0x%08x\n", fdt);
        else
-               printk("Compiled-in FDT at 0x%08x\n",
+               pr_info("Compiled-in FDT at 0x%08x\n",
                                        (unsigned int)_fdt_start);
 
 #ifdef CONFIG_MTD_UCLINUX
-       printk("Found romfs @ 0x%08x (0x%08x)\n",
+       pr_info("Found romfs @ 0x%08x (0x%08x)\n",
                        romfs_base, romfs_size);
-       printk("#### klimit %p ####\n", old_klimit);
+       pr_info("#### klimit %p ####\n", old_klimit);
        BUG_ON(romfs_size < 0); /* What else can we do? */
 
-       printk("Moved 0x%08x bytes from 0x%08x to 0x%08x\n",
+       pr_info("Moved 0x%08x bytes from 0x%08x to 0x%08x\n",
                        romfs_size, romfs_base, (unsigned)&__bss_stop);
 
-       printk("New klimit: 0x%08x\n", (unsigned)klimit);
+       pr_info("New klimit: 0x%08x\n", (unsigned)klimit);
 #endif
 
 #if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR
-       if (msr)
-               printk("!!!Your kernel has setup MSR instruction but "
-                               "CPU don't have it %x\n", msr);
+       if (msr) {
+               pr_info("!!!Your kernel has setup MSR instruction but ");
+               pr_cont("CPU don't have it %x\n", msr);
+       }
 #else
-       if (!msr)
-               printk("!!!Your kernel not setup MSR instruction but "
-                               "CPU have it %x\n", msr);
+       if (!msr) {
+               pr_info("!!!Your kernel not setup MSR instruction but ");
+               pr_cont"CPU have it %x\n", msr);
+       }
 #endif
 
        /* Do not copy reset vectors. offset = 0x2 means skip the first
index ac3d0a0..4fcbad0 100644 (file)
@@ -255,7 +255,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
        set_fs(USER_DS);
 
 #ifdef DEBUG_SIG
-       printk(KERN_INFO "SIG deliver (%s:%d): sp=%p pc=%08lx\n",
+       pr_info("SIG deliver (%s:%d): sp=%p pc=%08lx\n",
                current->comm, current->pid, frame, regs->pc);
 #endif
 
@@ -330,8 +330,8 @@ static void do_signal(struct pt_regs *regs, int in_syscall)
        int signr;
        struct k_sigaction ka;
 #ifdef DEBUG_SIG
-       printk(KERN_INFO "do signal: %p %d\n", regs, in_syscall);
-       printk(KERN_INFO "do signal2: %lx %lx %ld [%lx]\n", regs->pc, regs->r1,
+       pr_info("do signal: %p %d\n", regs, in_syscall);
+       pr_info("do signal2: %lx %lx %ld [%lx]\n", regs->pc, regs->r1,
                        regs->r12, current_thread_info()->flags);
 #endif
 
index 63647c5..3845677 100644 (file)
@@ -31,7 +31,6 @@
 #include <linux/uaccess.h>
 #include <linux/unistd.h>
 #include <linux/slab.h>
-
 #include <asm/syscalls.h>
 
 asmlinkage long sys_mmap(unsigned long addr, unsigned long len,
index 5541ac5..a37b2b1 100644 (file)
@@ -26,7 +26,7 @@ static unsigned long kstack_depth_to_print;   /* 0 == entire stack */
 
 static int __init kstack_setup(char *s)
 {
-       return !strict_strtoul(s, 0, &kstack_depth_to_print);
+       return !kstrtoul(s, 0, &kstack_depth_to_print);
 }
 __setup("kstack=", kstack_setup);
 
@@ -66,9 +66,7 @@ void show_stack(struct task_struct *task, unsigned long *sp)
        }
        print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS, 32, 4, (void *)fp,
                       words_to_show << 2, 0);
-       printk(KERN_INFO "\n\n");
-
-       pr_info("Call Trace:\n");
+       pr_info("\n\nCall Trace:\n");
        microblaze_unwind(task, NULL);
        pr_info("\n");
 
index beb80f3..dd80fbc 100644 (file)
@@ -25,5 +25,4 @@ long long __ashldi3(long long u, word_type b)
 
        return w.ll;
 }
-
 EXPORT_SYMBOL(__ashldi3);
index c884a91..1f21fc6 100644 (file)
@@ -27,5 +27,4 @@ long long __ashrdi3(long long u, word_type b)
 
        return w.ll;
 }
-
 EXPORT_SYMBOL(__ashrdi3);
index dcf8d68..c10090b 100644 (file)
@@ -25,5 +25,4 @@ long long __lshrdi3(long long u, word_type b)
 
        return w.ll;
 }
-
 EXPORT_SYMBOL(__lshrdi3);
index fe9c53f..15a6759 100644 (file)
@@ -103,12 +103,12 @@ void *memcpy(void *v_dst, const void *v_src, __kernel_size_t c)
                        }
 #else
                        /* Load the holding buffer */
-                       buf_hold = (*i_src++ & 0xFFFFFF00) >>8;
+                       buf_hold = (*i_src++ & 0xFFFFFF00) >> 8;
 
                        for (; c >= 4; c -= 4) {
                                value = *i_src++;
                                *i_dst++ = buf_hold | ((value & 0xFF) << 24);
-                               buf_hold = (value & 0xFFFFFF00) >>8;
+                               buf_hold = (value & 0xFFFFFF00) >> 8;
                        }
 #endif
                        /* Realign the source */
@@ -129,12 +129,12 @@ void *memcpy(void *v_dst, const void *v_src, __kernel_size_t c)
                        }
 #else
                        /* Load the holding buffer */
-                       buf_hold = (*i_src++ & 0xFFFF0000 )>>16;
+                       buf_hold = (*i_src++ & 0xFFFF0000) >> 16;
 
                        for (; c >= 4; c -= 4) {
                                value = *i_src++;
-                               *i_dst++ = buf_hold | ((value & 0xFFFF)<<16);
-                               buf_hold = (value & 0xFFFF0000) >>16;
+                               *i_dst++ = buf_hold | ((value & 0xFFFF) << 16);
+                               buf_hold = (value & 0xFFFF0000) >> 16;
                        }
 #endif
                        /* Realign the source */
index 2146c37..9843c6b 100644 (file)
@@ -129,7 +129,8 @@ void *memmove(void *v_dst, const void *v_src, __kernel_size_t c)
 
                        for (; c >= 4; c -= 4) {
                                value = *--i_src;
-                               *--i_dst = buf_hold | ((value & 0xFFFFFF00)>>8);
+                               *--i_dst = buf_hold |
+                                               ((value & 0xFFFFFF00) >> 8);
                                buf_hold = (value  & 0xFF) << 24;
                        }
 #endif
@@ -155,7 +156,8 @@ void *memmove(void *v_dst, const void *v_src, __kernel_size_t c)
 
                        for (; c >= 4; c -= 4) {
                                value = *--i_src;
-                               *--i_dst = buf_hold | ((value & 0xFFFF0000)>>16);
+                               *--i_dst = buf_hold |
+                                               ((value & 0xFFFF0000) >> 16);
                                buf_hold = (value & 0xFFFF) << 16;
                        }
 #endif
@@ -181,7 +183,8 @@ void *memmove(void *v_dst, const void *v_src, __kernel_size_t c)
 
                        for (; c >= 4; c -= 4) {
                                value = *--i_src;
-                               *--i_dst = buf_hold | ((value & 0xFF000000)>> 24);
+                               *--i_dst = buf_hold |
+                                               ((value & 0xFF000000) >> 24);
                                buf_hold = (value & 0xFFFFFF) << 8;
                        }
 #endif
index a1e2e18..fe5fcdb 100644 (file)
@@ -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;
index 714b35a..731f739 100644 (file)
@@ -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);
        }
index ce80823..8f8b367 100644 (file)
@@ -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);
        }
 
index d1c06d0..1888b0f 100644 (file)
@@ -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;
 }
index 4196eb6..ae4fca4 100644 (file)
@@ -15,7 +15,7 @@
 #include <linux/string.h>
 #include <linux/init.h>
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
 
index b07abba..94149f5 100644 (file)
@@ -7,7 +7,7 @@
 #include <linux/pci.h>
 #include <linux/mm.h>
 #include <linux/export.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/pci-bridge.h>
 
 void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
index 9641655..bdb8ea1 100644 (file)
@@ -33,7 +33,7 @@
 #include <linux/export.h>
 
 #include <asm/processor.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/pci-bridge.h>
 #include <asm/byteorder.h>
 
@@ -552,11 +552,10 @@ int pci_mmap_legacy_page_range(struct pci_bus *bus,
                 */
                if ((offset + size) > hose->isa_mem_size) {
 #ifdef CONFIG_MMU
-                       printk(KERN_DEBUG
-                               "Process %s (pid:%d) mapped non-existing PCI"
-                               "legacy memory for 0%04x:%02x\n",
-                               current->comm, current->pid, pci_domain_nr(bus),
-                                                               bus->number);
+                       pr_debug("Process %s (pid:%d) mapped non-existing PCI",
+                               current->comm, current->pid);
+                       pr_debug("legacy memory for 0%04x:%02x\n",
+                               pci_domain_nr(bus), bus->number);
 #endif
                        if (vma->vm_flags & VM_SHARED)
                                return shmem_zero_setup(vma);
@@ -564,7 +563,7 @@ int pci_mmap_legacy_page_range(struct pci_bus *bus,
                }
                offset += hose->isa_mem_phys;
        } else {
-               unsigned long io_offset = (unsigned long)hose->io_base_virt - \
+               unsigned long io_offset = (unsigned long)hose->io_base_virt -
                                                                _IO_BASE;
                unsigned long roffset = offset + io_offset;
                rp = &hose->io_resource;
@@ -668,7 +667,7 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
        unsigned long long isa_mb = 0;
        struct resource *res;
 
-       printk(KERN_INFO "PCI host bridge %s %s ranges:\n",
+       pr_info("PCI host bridge %s %s ranges:\n",
               dev->full_name, primary ? "(primary)" : "");
 
        /* Get ranges property */
@@ -685,9 +684,10 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
                cpu_addr = of_translate_address(dev, ranges + 3);
                size = of_read_number(ranges + pna + 3, 2);
 
-               pr_debug("pci_space: 0x%08x pci_addr:0x%016llx "
-                               "cpu_addr:0x%016llx size:0x%016llx\n",
-                                       pci_space, pci_addr, cpu_addr, size);
+               pr_debug("pci_space: 0x%08x pci_addr:0x%016llx ",
+                               pci_space, pci_addr);
+               pr_debug("cpu_addr:0x%016llx size:0x%016llx\n",
+                                       cpu_addr, size);
 
                ranges += np;
 
@@ -716,14 +716,12 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
                res = NULL;
                switch ((pci_space >> 24) & 0x3) {
                case 1:         /* PCI IO space */
-                       printk(KERN_INFO
-                              "  IO 0x%016llx..0x%016llx -> 0x%016llx\n",
+                       pr_info("  IO 0x%016llx..0x%016llx -> 0x%016llx\n",
                               cpu_addr, cpu_addr + size - 1, pci_addr);
 
                        /* We support only one IO range */
                        if (hose->pci_io_size) {
-                               printk(KERN_INFO
-                                      " \\--> Skipped (too many) !\n");
+                               pr_info(" \\--> Skipped (too many) !\n");
                                continue;
                        }
                        /* On 32 bits, limit I/O space to 16MB */
@@ -750,15 +748,13 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
                        break;
                case 2:         /* PCI Memory space */
                case 3:         /* PCI 64 bits Memory space */
-                       printk(KERN_INFO
-                              " MEM 0x%016llx..0x%016llx -> 0x%016llx %s\n",
+                       pr_info(" MEM 0x%016llx..0x%016llx -> 0x%016llx %s\n",
                               cpu_addr, cpu_addr + size - 1, pci_addr,
                               (pci_space & 0x40000000) ? "Prefetch" : "");
 
                        /* We support only 3 memory ranges */
                        if (memno >= 3) {
-                               printk(KERN_INFO
-                                      " \\--> Skipped (too many) !\n");
+                               pr_info(" \\--> Skipped (too many) !\n");
                                continue;
                        }
                        /* Handles ISA memory hole space here */
@@ -781,8 +777,7 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
                                hose->pci_mem_offset = cpu_addr - pci_addr;
                        else if (pci_addr != 0 &&
                                 hose->pci_mem_offset != cpu_addr - pci_addr) {
-                               printk(KERN_INFO
-                                      " \\--> Skipped (offset mismatch) !\n");
+                               pr_info(" \\--> Skipped (offset mismatch) !\n");
                                continue;
                        }
 
@@ -809,7 +804,7 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
         */
        if (isa_hole >= 0 && hose->pci_mem_offset != isa_mb) {
                unsigned int next = isa_hole + 1;
-               printk(KERN_INFO " Removing ISA hole at 0x%016llx\n", isa_mb);
+               pr_info(" Removing ISA hole at 0x%016llx\n", isa_mb);
                if (next < memno)
                        memmove(&hose->mem_resources[isa_hole],
                                &hose->mem_resources[next],
@@ -833,7 +828,7 @@ static void pcibios_fixup_resources(struct pci_dev *dev)
        int i;
 
        if (!hose) {
-               printk(KERN_ERR "No host bridge for PCI dev %s !\n",
+               pr_err("No host bridge for PCI dev %s !\n",
                       pci_name(dev));
                return;
        }
@@ -842,12 +837,12 @@ static void pcibios_fixup_resources(struct pci_dev *dev)
                if (!res->flags)
                        continue;
                if (res->start == 0) {
-                       pr_debug("PCI:%s Resource %d %016llx-%016llx [%x]" \
-                                                       "is unassigned\n",
+                       pr_debug("PCI:%s Resource %d %016llx-%016llx [%x]",
                                 pci_name(dev), i,
                                 (unsigned long long)res->start,
                                 (unsigned long long)res->end,
                                 (unsigned int)res->flags);
+                       pr_debug("is unassigned\n");
                        res->end -= res->start;
                        res->start = 0;
                        res->flags |= IORESOURCE_UNSET;
@@ -856,7 +851,7 @@ static void pcibios_fixup_resources(struct pci_dev *dev)
 
                pr_debug("PCI:%s Resource %d %016llx-%016llx [%x]\n",
                         pci_name(dev), i,
-                        (unsigned long long)res->start,\
+                        (unsigned long long)res->start,
                         (unsigned long long)res->end,
                         (unsigned int)res->flags);
        }
@@ -947,7 +942,7 @@ static void pcibios_fixup_bridge(struct pci_bus *bus)
 
                pr_debug("PCI:%s Bus rsrc %d %016llx-%016llx [%x] fixup...\n",
                         pci_name(dev), i,
-                        (unsigned long long)res->start,\
+                        (unsigned long long)res->start,
                         (unsigned long long)res->end,
                         (unsigned int)res->flags);
 
@@ -1154,12 +1149,12 @@ static void pcibios_allocate_bus_resources(struct pci_bus *bus)
                        }
                }
 
-               pr_debug("PCI: %s (bus %d) bridge rsrc %d: %016llx-%016llx "
-                        "[0x%x], parent %p (%s)\n",
+               pr_debug("PCI: %s (bus %d) bridge rsrc %d: %016llx-%016llx ",
                         bus->self ? pci_name(bus->self) : "PHB",
                         bus->number, i,
                         (unsigned long long)res->start,
-                        (unsigned long long)res->end,
+                        (unsigned long long)res->end);
+               pr_debug("[0x%x], parent %p (%s)\n",
                         (unsigned int)res->flags,
                         pr, (pr && pr->name) ? pr->name : "nil");
 
@@ -1174,9 +1169,8 @@ static void pcibios_allocate_bus_resources(struct pci_bus *bus)
                        if (reparent_resources(pr, res) == 0)
                                continue;
                }
-               printk(KERN_WARNING "PCI: Cannot allocate resource region "
-                      "%d of PCI bridge %d, will remap\n", i, bus->number);
-
+               pr_warn("PCI: Cannot allocate resource region ");
+               pr_cont("%d of PCI bridge %d, will remap\n", i, bus->number);
                res->start = res->end = 0;
                res->flags = 0;
        }
@@ -1198,8 +1192,8 @@ static inline void alloc_resource(struct pci_dev *dev, int idx)
        pr = pci_find_parent_resource(dev, r);
        if (!pr || (pr->flags & IORESOURCE_UNSET) ||
            request_resource(pr, r) < 0) {
-               printk(KERN_WARNING "PCI: Cannot allocate resource region %d"
-                      " of device %s, will remap\n", idx, pci_name(dev));
+               pr_warn("PCI: Cannot allocate resource region %d ", idx);
+               pr_cont("of device %s, will remap\n", pci_name(dev));
                if (pr)
                        pr_debug("PCI:  parent is %p: %016llx-%016llx [%x]\n",
                                 pr,
@@ -1282,8 +1276,7 @@ static void __init pcibios_reserve_legacy_regions(struct pci_bus *bus)
        res->end = (offset + 0xfff) & 0xfffffffful;
        pr_debug("Candidate legacy IO: %pR\n", res);
        if (request_resource(&hose->io_resource, res)) {
-               printk(KERN_DEBUG
-                      "PCI %04x:%02x Cannot reserve Legacy IO %pR\n",
+               pr_debug("PCI %04x:%02x Cannot reserve Legacy IO %pR\n",
                       pci_domain_nr(bus), bus->number, res);
                kfree(res);
        }
@@ -1311,8 +1304,7 @@ static void __init pcibios_reserve_legacy_regions(struct pci_bus *bus)
        res->end = 0xbffff + offset;
        pr_debug("Candidate VGA memory: %pR\n", res);
        if (request_resource(pres, res)) {
-               printk(KERN_DEBUG
-                      "PCI %04x:%02x Cannot reserve VGA memory %pR\n",
+               pr_debug("PCI %04x:%02x Cannot reserve VGA memory %pR\n",
                       pci_domain_nr(bus), bus->number, res);
                kfree(res);
        }
@@ -1362,10 +1354,9 @@ void pcibios_claim_one_bus(struct pci_bus *bus)
                        if (r->parent || !r->start || !r->flags)
                                continue;
 
-                       pr_debug("PCI: Claiming %s: "
-                                "Resource %d: %016llx..%016llx [%x]\n",
-                                pci_name(dev), i,
-                                (unsigned long long)r->start,
+                       pr_debug("PCI: Claiming %s: ", pci_name(dev));
+                       pr_debug("Resource %d: %016llx..%016llx [%x]\n",
+                                i, (unsigned long long)r->start,
                                 (unsigned long long)r->end,
                                 (unsigned int)r->flags);
 
@@ -1423,9 +1414,9 @@ static void pcibios_setup_phb_resources(struct pci_controller *hose,
        res->end = (res->end + io_offset) & 0xffffffffu;
 
        if (!res->flags) {
-               printk(KERN_WARNING "PCI: I/O resource not set for host"
-                      " bridge %s (domain %d)\n",
-                      hose->dn->full_name, hose->global_number);
+               pr_warn("PCI: I/O resource not set for host ");
+               pr_cont("bridge %s (domain %d)\n",
+                       hose->dn->full_name, hose->global_number);
                /* Workaround for lack of IO resource only on 32-bit */
                res->start = (unsigned long)hose->io_base_virt - isa_io_base;
                res->end = res->start + IO_SPACE_LIMIT;
@@ -1445,9 +1436,9 @@ static void pcibios_setup_phb_resources(struct pci_controller *hose,
                if (!res->flags) {
                        if (i > 0)
                                continue;
-                       printk(KERN_ERR "PCI: Memory resource 0 not set for "
-                              "host bridge %s (domain %d)\n",
-                              hose->dn->full_name, hose->global_number);
+                       pr_err("PCI: Memory resource 0 not set for ");
+                       pr_cont("host bridge %s (domain %d)\n",
+                               hose->dn->full_name, hose->global_number);
 
                        /* Workaround for lack of MEM resource only on 32-bit */
                        res->start = hose->pci_mem_offset;
@@ -1489,7 +1480,7 @@ static void pcibios_scan_phb(struct pci_controller *hose)
        bus = pci_scan_root_bus(hose->parent, hose->first_busno,
                                hose->ops, hose, &resources);
        if (bus == NULL) {
-               printk(KERN_ERR "Failed to create bus for PCI domain %04x\n",
+               pr_err("Failed to create bus for PCI domain %04x\n",
                       hose->global_number);
                pci_free_resource_list(&resources);
                return;
@@ -1505,7 +1496,7 @@ static int __init pcibios_init(void)
        struct pci_controller *hose, *tmp;
        int next_busno = 0;
 
-       printk(KERN_INFO "PCI: Probing PCI hardware\n");
+       pr_info("PCI: Probing PCI hardware\n");
 
        /* Scan all of the recorded PCI controllers.  */
        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
@@ -1605,7 +1596,7 @@ fake_pci_bus(struct pci_controller *hose, int busnr)
        static struct pci_bus bus;
 
        if (!hose)
-               printk(KERN_ERR "Can't find hose for PCI bus %d!\n", busnr);
+               pr_err("Can't find hose for PCI bus %d!\n", busnr);
 
        bus.number = busnr;
        bus.sysdata = hose;
index 0687a42..14c7da5 100644 (file)
@@ -18,7 +18,7 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/pci.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 #define XPLB_PCI_ADDR 0x10c
 #define XPLB_PCI_DATA 0x110
@@ -82,7 +82,7 @@ xilinx_pci_exclude_device(struct pci_controller *hose, u_char bus, u8 devfn)
  *
  * List pci devices in very early phase.
  */
-void __init xilinx_early_pci_scan(struct pci_controller *hose)
+static void __init xilinx_early_pci_scan(struct pci_controller *hose)
 {
        u32 bus = 0;
        u32 val, dev, func, offset;
@@ -91,27 +91,27 @@ void __init xilinx_early_pci_scan(struct pci_controller *hose)
        for (dev = 0; dev < 2; dev++) {
                /* List only first function number - up-to 8 functions */
                for (func = 0; func < 1; func++) {
-                       printk(KERN_INFO "%02x:%02x:%02x", bus, dev, func);
+                       pr_info("%02x:%02x:%02x", bus, dev, func);
                        /* read the first 64 standardized bytes */
                        /* Up-to 192 bytes can be list of capabilities */
                        for (offset = 0; offset < 64; offset += 4) {
                                early_read_config_dword(hose, bus,
                                        PCI_DEVFN(dev, func), offset, &val);
                                if (offset == 0 && val == 0xFFFFFFFF) {
-                                       printk(KERN_CONT "\nABSENT");
+                                       pr_cont("\nABSENT");
                                        break;
                                }
                                if (!(offset % 0x10))
-                                       printk(KERN_CONT "\n%04x:    ", offset);
+                                       pr_cont("\n%04x:    ", offset);
 
-                               printk(KERN_CONT "%08x  ", val);
+                               pr_cont("%08x  ", val);
                        }
-                       printk(KERN_INFO "\n");
+                       pr_info("\n");
                }
        }
 }
 #else
-void __init xilinx_early_pci_scan(struct pci_controller *hose)
+static void __init xilinx_early_pci_scan(struct pci_controller *hose)
 {
 }
 #endif