These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / mips / bcm63xx / setup.c

diff --git a/kernel/arch/mips/bcm63xx/setup.c b/kernel/arch/mips/bcm63xx/setup.c
index 240fb4f..2be9caa 100644 (file)
--- a/kernel/arch/mips/bcm63xx/setup.c
+++ b/kernel/arch/mips/bcm63xx/setup.c
@@ -24,7 +24,7 @@
 
 void bcm63xx_machine_halt(void)
 {
-       printk(KERN_INFO "System halted\n");
+       pr_info("System halted\n");
        while (1)
                ;
 }
@@ -34,7 +34,7 @@ static void bcm6348_a1_reboot(void)
        u32 reg;
 
        /* soft reset all blocks */
-       printk(KERN_INFO "soft-resetting all blocks ...\n");
+       pr_info("soft-resetting all blocks ...\n");
        reg = bcm_perf_readl(PERF_SOFTRESET_REG);
        reg &= ~SOFTRESET_6348_ALL;
        bcm_perf_writel(reg, PERF_SOFTRESET_REG);
@@ -46,7 +46,7 @@ static void bcm6348_a1_reboot(void)
        mdelay(10);
 
        /* Jump to the power on address. */
-       printk(KERN_INFO "jumping to reset vector.\n");
+       pr_info("jumping to reset vector.\n");
        /* set high vectors (base at 0xbfc00000 */
        set_c0_status(ST0_BEV | ST0_ERL);
        /* run uncached in kseg0 */
@@ -110,7 +110,7 @@ void bcm63xx_machine_reboot(void)
        if (BCMCPU_IS_6348() && (bcm63xx_get_cpu_rev() == 0xa1))
                bcm6348_a1_reboot();
 
-       printk(KERN_INFO "triggering watchdog soft-reset...\n");
+       pr_info("triggering watchdog soft-reset...\n");
        if (BCMCPU_IS_6328()) {
                bcm_wdt_writel(1, WDT_SOFTRESET_REG);
        } else {