diff -urN linux-2.6.0-test1/arch/mips/arc/identify.c linux-2.6.0-test1-printk-mips/arch/mips/arc/identify.c --- linux-2.6.0-test1/arch/mips/arc/identify.c 2003-07-13 23:31:50.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/arc/identify.c 2003-07-17 21:06:12.000000000 -0400 @@ -109,7 +109,7 @@ } else iname = (char *) (long) p->iname; - printk("ARCH: %s\n", iname); + printk(KERN_INFO "ARCH: %s\n", iname); mach = string_to_mach(iname); system_type = mach->liname; diff -urN linux-2.6.0-test1/arch/mips/au1000/common/clocks.c linux-2.6.0-test1-printk-mips/arch/mips/au1000/common/clocks.c --- linux-2.6.0-test1/arch/mips/au1000/common/clocks.c 2003-07-13 23:34:34.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/au1000/common/clocks.c 2003-07-17 19:36:11.000000000 -0400 @@ -85,7 +85,7 @@ lcd_clock = sys_busclk / 4; if (lcd_clock > 50000) /* Epson MAX */ - printk("%s: warning: LCD clock too high (%d KHz)\n", + printk(KERN_WARNING "%s: warning: LCD clock too high (%d KHz)\n", __FUNCTION__, lcd_clock); } diff -urN linux-2.6.0-test1/arch/mips/au1000/common/dma.c linux-2.6.0-test1-printk-mips/arch/mips/au1000/common/dma.c --- linux-2.6.0-test1/arch/mips/au1000/common/dma.c 2003-07-13 23:38:05.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/au1000/common/dma.c 2003-07-17 19:37:14.000000000 -0400 @@ -203,7 +203,7 @@ { struct dma_chan *chan = get_dma_chan(dmanr); if (!chan) { - printk("Trying to free DMA%d\n", dmanr); + printk(KERN_NOTICE "Trying to free DMA%d\n", dmanr); return; } diff -urN linux-2.6.0-test1/arch/mips/au1000/common/irq.c linux-2.6.0-test1-printk-mips/arch/mips/au1000/common/irq.c --- linux-2.6.0-test1/arch/mips/au1000/common/irq.c 2003-07-13 23:32:43.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/au1000/common/irq.c 2003-07-17 19:35:52.000000000 -0400 @@ -137,7 +137,7 @@ au_writel(1<<(irq_nr-32), IC1_CFG2CLR); break; default: /* disable the interrupt */ - printk("unexpected int type %d (irq %d)\n", type, irq_nr); + printk(KERN_WARNING "unexpected int type %d (irq %d)\n", type, irq_nr); au_writel(1<<(irq_nr-32), IC1_CFG0CLR); au_writel(1<<(irq_nr-32), IC1_CFG1CLR); au_writel(1<<(irq_nr-32), IC1_CFG2CLR); @@ -179,7 +179,7 @@ au_writel(1< 2*MATCH20_INC) { - printk("huge offset %x, last_pc0 %x last_match20 %x pc0 %x\n", + printk(KERN_NOTICE "huge offset %x, last_pc0 %x last_match20 %x pc0 %x\n", (unsigned)offset, (unsigned)last_pc0, (unsigned)last_match20, (unsigned)pc0); } diff -urN linux-2.6.0-test1/arch/mips/au1000/db1x00/setup.c linux-2.6.0-test1-printk-mips/arch/mips/au1000/db1x00/setup.c --- linux-2.6.0-test1/arch/mips/au1000/db1x00/setup.c 2003-07-13 23:33:11.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/au1000/db1x00/setup.c 2003-07-17 19:42:24.000000000 -0400 @@ -200,13 +200,13 @@ au_writel(0, 0xAE000010); /* turn off pcmcia power */ #ifdef CONFIG_MIPS_DB1000 - printk("AMD Alchemy Au1000/Db1000 Board\n"); + printk(KERN_INFO "AMD Alchemy Au1000/Db1000 Board\n"); #endif #ifdef CONFIG_MIPS_DB1500 - printk("AMD Alchemy Au1500/Db1500 Board\n"); + printk(KERN_INFO "AMD Alchemy Au1500/Db1500 Board\n"); #endif #ifdef CONFIG_MIPS_DB1100 - printk("AMD Alchemy Au1100/Db1100 Board\n"); + printk(KERN_INFO "AMD Alchemy Au1100/Db1100 Board\n"); #endif } diff -urN linux-2.6.0-test1/arch/mips/au1000/pb1000/setup.c linux-2.6.0-test1-printk-mips/arch/mips/au1000/pb1000/setup.c --- linux-2.6.0-test1/arch/mips/au1000/pb1000/setup.c 2003-07-13 23:37:27.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/au1000/pb1000/setup.c 2003-07-17 19:42:49.000000000 -0400 @@ -164,7 +164,7 @@ /* CPU core freq to 384MHz */ au_writel(0x20, SYS_CPUPLL); - printk("Au1000: 48MHz OHCI workaround enabled\n"); + printk(KERN_INFO "Au1000: 48MHz OHCI workaround enabled\n"); break; default: /* HC and newer */ diff -urN linux-2.6.0-test1/arch/mips/au1000/pb1500/setup.c linux-2.6.0-test1-printk-mips/arch/mips/au1000/pb1500/setup.c --- linux-2.6.0-test1/arch/mips/au1000/pb1500/setup.c 2003-07-13 23:36:33.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/au1000/pb1500/setup.c 2003-07-17 19:42:05.000000000 -0400 @@ -261,7 +261,7 @@ rtc_ops = &pb1500_rtc_ops; // Enable the RTC if not already enabled if (!(au_readl(0xac000028) & 0x20)) { - printk("enabling clock ...\n"); + printk(KERN_INFO "enabling clock ...\n"); au_writel((au_readl(0xac000028) | 0x20), 0xac000028); } // Put the clock in BCD mode diff -urN linux-2.6.0-test1/arch/mips/baget/baget.c linux-2.6.0-test1-printk-mips/arch/mips/baget/baget.c --- linux-2.6.0-test1/arch/mips/baget/baget.c 2003-07-13 23:36:37.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/baget/baget.c 2003-07-16 20:09:47.000000000 -0400 @@ -32,7 +32,7 @@ while (address < end) { unsigned long page; if (!pte_none(*pte)) - printk("kseg2_alloc_io: page already exists\n"); + printk(KERN_WARNING "kseg2_alloc_io: page already exists\n"); /* * For MIPS looks pretty to have transparent mapping * for KSEG2 areas -- user can't access one, and no diff -urN linux-2.6.0-test1/arch/mips/baget/irq.c linux-2.6.0-test1-printk-mips/arch/mips/baget/irq.c --- linux-2.6.0-test1/arch/mips/baget/irq.c 2003-07-13 23:35:56.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/baget/irq.c 2003-07-16 20:09:10.000000000 -0400 @@ -201,7 +201,7 @@ add_interrupt_randomness(irq); local_irq_disable(); } else { - printk("do_IRQ: Unregistered IRQ (0x%X) occurred\n", irq); + printk(KERN_WARNING "do_IRQ: Unregistered IRQ (0x%X) occurred\n", irq); } unmask_irq(irq); irq_exit(); @@ -214,7 +214,7 @@ */ static void vic_reg_error(unsigned long address, unsigned char active_pils) { - printk("\nNo VIC register found: reg=%08lx active_pils=%02x\n" + printk(KERN_ERR "\nNo VIC register found: reg=%08lx active_pils=%02x\n" "Current interrupt mask from CP0_CAUSE: %02x\n", address, 0xff & active_pils, 0xff & (read_c0_cause()>>8)); @@ -252,7 +252,7 @@ else vic_reg_error(reg->address, active_pils); } else { - printk("baget_interrupt: unknown interrupt " + printk(KERN_ERR "baget_interrupt: unknown interrupt " "(pil = %d)\n", pil); } } @@ -343,7 +343,7 @@ unsigned long flags; if (irq >= BAGET_IRQ_NR) - printk("Trying to free IRQ%d\n",irq); + printk(KERN_NOTICE "Trying to free IRQ%d\n",irq); for (p = irq + irq_action; (action = *p) != NULL; p = &action->next) { if (action->dev_id != dev_id) @@ -358,7 +358,7 @@ kfree(action); return; } - printk("Trying to free free IRQ%d\n",irq); + printk(KERN_NOTICE "Trying to free free IRQ%d\n",irq); } unsigned long probe_irq_on (void) @@ -393,5 +393,5 @@ modify_cp0_intmask(0, (1<<2)|(1<<3)); if (setup_baget_irq(0, &irq0) < 0) - printk("init_IRQ: unable to register write_err irq\n"); + printk(KERN_WARNING "init_IRQ: unable to register write_err irq\n"); } diff -urN linux-2.6.0-test1/arch/mips/baget/setup.c linux-2.6.0-test1-printk-mips/arch/mips/baget/setup.c --- linux-2.6.0-test1/arch/mips/baget/setup.c 2003-07-13 23:28:56.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/baget/setup.c 2003-07-16 20:03:17.000000000 -0400 @@ -37,33 +37,33 @@ VAC_IOSEL4_CTRL, VAC_IOSEL5_CTRL }; - printk("[DSACKi %s, DRAMCS%s qualified, boundary%s qualified%s]\n", + printk(KERN_INFO "[DSACKi %s, DRAMCS%s qualified, boundary%s qualified%s]\n", (decode & VAC_DECODE_DSACKI) ? "on" : "off", (decode & VAC_DECODE_QFY_DRAMCS) ? "" : " not", (decode & VAC_DECODE_QFY_BNDR) ? "" : " not", (decode & VAC_DECODE_FPUCS) ? ", fpu" : ""); - printk("slave0 "); + printk(KERN_INFO "slave0 "); if (decode & VAC_DECODE_RDR_SLSEL0) - printk("at %08lx (%d MB)\t[dram %s]\n", + printk(KERN_INFO "at %08lx (%d MB)\t[dram %s]\n", ((unsigned long)vac_inw(VAC_SLSEL0_BASE))<<16, ((0xffff ^ vac_inw(VAC_SLSEL0_MASK)) + 1) >> 4, (decode & VAC_DECODE_QFY_SLSEL0) ? "qualified" : ""); else - printk("off\n"); + printk(KERN_INFO "off\n"); - printk("slave1 "); + printk(KERN_INFO "slave1 "); if (decode & VAC_DECODE_RDR_SLSEL1) - printk("at %08lx (%d MB)\t[%s%s, %s]\n", + printk(KERN_INFO "at %08lx (%d MB)\t[%s%s, %s]\n", ((unsigned long)vac_inw(VAC_SLSEL1_BASE))<<16, ((0xffff ^ vac_inw(VAC_SLSEL1_MASK)) + 1) >> 4, decode_mode[VAC_DECODE_MODE_VAL(decode)], address_mode[VAC_DECODE_CMP_SLSEL1_VAL(decode)], (decode & VAC_DECODE_QFY_SLSEL1) ? "qualified" : ""); else - printk("off\n"); + printk(KERN_INFO "off\n"); - printk("icf global at %04x, module at %04x [%s]\n", + printk(KERN_INFO "icf global at %04x, module at %04x [%s]\n", ((unsigned int) VAC_ICFSEL_GLOBAL_VAL(vac_inw(VAC_ICFSEL_BASE)))<<4, ((unsigned int) @@ -71,7 +71,7 @@ (decode & VAC_DECODE_QFY_ICFSEL) ? "qualified" : ""); - printk("region0 at 00000000 (%dMB)\t[dram, %s, delay %d cpuclk" + printk(KERN_INFO "region0 at 00000000 (%dMB)\t[dram, %s, delay %d cpuclk" ", cached]\n", (vac_inw(VAC_DRAM_MASK)+1)>>4, (decode & VAC_DECODE_DSACK) ? "D32" : "3state", @@ -87,7 +87,7 @@ val = vac_inw(regs[i]); - printk("region%d at %08lx (%dMB)\t[%s %s/%s, %s]\n", + printk(KERN_INFO "region%d at %08lx (%dMB)\t[%s %s/%s, %s]\n", i+1, from, (unsigned int)((to - from) >> 20), @@ -97,7 +97,7 @@ CACHEABLE_STR(val&VAC_A24_A24_CACHINH)); if (a24_addr >= from && a24_addr < to) - printk("\ta24 at %08lx (%dMB)\t[vme, A24/%s, %s]\n", + printk(KERN_INFO "\ta24 at %08lx (%dMB)\t[vme, A24/%s, %s]\n", a24_addr, min((unsigned int)(a24_addr - from)>>20, 32U), (a24_base & VAC_A24_DATAPATH) ? "user" : @@ -106,9 +106,9 @@ CACHEABLE_STR(a24_base & VAC_A24_A24_CACHINH)); } - printk("region4 at ff000000 (15MB)\t[eprom]\n"); + printk(KERN_INFO "region4 at ff000000 (15MB)\t[eprom]\n"); val = vac_inw(VAC_EPROMCS_CTRL); - printk("\t[ack %d cpuclk%s, %s%srecovery %d cpuclk, " + printk(KERN_INFO "\t[ack %d cpuclk%s, %s%srecovery %d cpuclk, " "read %d%s, write %d%s, assert %d%s]\n", VAC_CTRL_DELAY_DSACKI_VAL(val), state[val & (VAC_CTRL_IORD|VAC_CTRL_IOWR)], @@ -122,12 +122,12 @@ VAC_CTRL_DELAY_IOSELI_VAL(val)/2, (VAC_CTRL_DELAY_IOSELI_VAL(val)&1) ? ".5" : ""); - printk("region5 at fff00000 (896KB)\t[local io, %s]\n", + printk(KERN_INFO "region5 at fff00000 (896KB)\t[local io, %s]\n", CACHEABLE_STR(vac_inw(VAC_A24_BASE) & VAC_A24_IO_CACHINH)); for (i = 0; i < sizeof(io_sels)/sizeof(io_sels[0]); i++) { val = vac_inw(io_sels[i]); - printk("\tio%d[ack %d cpuclk%s, %s%srecovery %d cpuclk, " + printk(KERN_INFO "\tio%d[ack %d cpuclk%s, %s%srecovery %d cpuclk, " "\n\t read %d%s cpuclk, write %d%s cpuclk, " "assert %d%s%s cpuclk]\n", i, @@ -146,13 +146,13 @@ ", id" : ""); } - printk("region6 at fffe0000 (128KB)\t[vme, A16/%s, " + printk(KERN_INFO "region6 at fffe0000 (128KB)\t[vme, A16/%s, " "not cached]\n", (a24_base & VAC_A24_A16D32_ENABLE) ? ((a24_base & VAC_A24_A16D32) ? "D32" : "D16") : "user"); val = vac_inw(VAC_SHRCS_CTRL); - printk("shared[ack %d cpuclk%s, %s%srecovery %d cpuclk, " + printk(KERN_INFO "shared[ack %d cpuclk%s, %s%srecovery %d cpuclk, " "read %d%s, write %d%s, assert %d%s]\n", VAC_CTRL_DELAY_DSACKI_VAL(val), state[val & (VAC_CTRL_IORD|VAC_CTRL_IOWR)], @@ -173,10 +173,10 @@ switch(vac_inw(VAC_ID)) { case 0x1AC0: - printk("VAC068-F5: "); + printk(KERN_INFO "VAC068-F5: "); break; case 0x1AC1: - printk("VAC068A: "); + printk(KERN_INFO "VAC068A: "); break; default: panic("Unknown VAC revision number"); @@ -310,52 +310,52 @@ val = vic_inb(VIC_IFACE_CFG); if (val & VIC_IFACE_CFG_VME) - printk("VMEbus controller "); + printk(KERN_INFO "VMEbus controller "); if (val & VIC_IFACE_CFG_TURBO) - printk("turbo "); + printk(KERN_INFO "turbo "); if (val & VIC_IFACE_CFG_MSTAB) - printk("metastability delay "); - printk("%s ", + printk(KERN_INFO "metastability delay "); + printk(KERN_INFO "%s ", deadlock[VIC_IFACE_CFG_DEADLOCK_VAL(val)]); - printk("interrupts: "); + printk(KERN_INFO "interrupts: "); val = vic_inb(VIC_ERR_INT); if (!(val & VIC_ERR_INT_SYSFAIL)) - printk("[sysfail]"); + printk(KERN_INFO "[sysfail]"); if (!(val & VIC_ERR_INT_TIMO)) - printk("[timeout]"); + printk(KERN_INFO "[timeout]"); if (!(val & VIC_ERR_INT_WRPOST)) - printk("[write post]"); + printk(KERN_INFO "[write post]"); if (!(val & VIC_ERR_INT_ACFAIL)) - printk("[acfail] "); - printk("\n"); + printk(KERN_INFO "[acfail] "); + printk(KERN_INFO "\n"); - printk("timeouts: "); + printk(KERN_INFO "timeouts: "); val = vic_inb(VIC_XFER_TIMO); - printk("local %s, vme %s ", + printk(KERN_INFO "local %s, vme %s ", timeout[VIC_XFER_TIMO_LOCAL_PERIOD_VAL(val)], timeout[VIC_XFER_TIMO_VME_PERIOD_VAL(val)]); if (val & VIC_XFER_TIMO_VME) - printk("acquisition "); + printk(KERN_INFO "acquisition "); if (val & VIC_XFER_TIMO_ARB) - printk("arbitration "); - printk("\n"); + printk(KERN_INFO "arbitration "); + printk(KERN_INFO "\n"); val = vic_inb(VIC_LOCAL_TIM); - printk("pas time: (%d,%d), ds time: %d\n", + printk(KERN_INFO "pas time: (%d,%d), ds time: %d\n", VIC_LOCAL_TIM_PAS_ASSERT_VAL(val), VIC_LOCAL_TIM_PAS_DEASSERT_VAL(val), VIC_LOCAT_TIM_DS_DEASSERT_VAL(val)); val = vic_inb(VIC_BXFER_DEF); - printk("dma: "); + printk(KERN_INFO "dma: "); if (val & VIC_BXFER_DEF_DUAL) - printk("[dual path]"); + printk(KERN_INFO "[dual path]"); if (val & VIC_BXFER_DEF_LOCAL_CROSS) - printk("[local boundary cross]"); + printk(KERN_INFO "[local boundary cross]"); if (val & VIC_BXFER_DEF_VME_CROSS) - printk("[vme boundary cross]"); + printk(KERN_INFO "[vme boundary cross]"); } @@ -364,7 +364,7 @@ unsigned char id = vic_inb(VIC_ID); if ((id & 0xf0) != 0xf0) panic("VIC not found"); - printk(" VIC068A Rev. %X: ", id & 0x0f); + printk(KERN_INFO " VIC068A Rev. %X: ", id & 0x0f); vic_outb(VIC_INT_IPL(3)|VIC_INT_DISABLE,VIC_VME_II); vic_outb(VIC_INT_IPL(3)|VIC_INT_DISABLE,VIC_VME_INT1); @@ -472,7 +472,7 @@ void __init baget_setup(void) { - printk("BT23/63-201n found.\n"); + printk(KERN_INFO "BT23/63-201n found.\n"); *BAGET_WRERR_ACK = 0; irq_setup = baget_irq_setup; diff -urN linux-2.6.0-test1/arch/mips/baget/time.c linux-2.6.0-test1-printk-mips/arch/mips/baget/time.c --- linux-2.6.0-test1/arch/mips/baget/time.c 2003-07-13 23:28:54.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/baget/time.c 2003-07-16 20:00:19.000000000 -0400 @@ -71,7 +71,7 @@ void __init time_init(void) { if (setup_baget_irq(BAGET_VIC_TIMER_IRQ, &timer_irq) < 0) - printk("time_init: unable request irq for system timer\n"); + printk(KERN_ERR "time_init: unable request irq for system timer\n"); timer_enable(); /* We don't call sti() here, because it is too early for baget */ } diff -urN linux-2.6.0-test1/arch/mips/cobalt/reset.c linux-2.6.0-test1-printk-mips/arch/mips/cobalt/reset.c --- linux-2.6.0-test1/arch/mips/cobalt/reset.c 2003-07-13 23:28:55.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/cobalt/reset.c 2003-07-16 20:17:55.000000000 -0400 @@ -63,6 +63,6 @@ */ void cobalt_machine_power_off(void) { - printk("You can switch the machine off now.\n"); + printk(KERN_NOTICE "You can switch the machine off now.\n"); cobalt_machine_halt(); } diff -urN linux-2.6.0-test1/arch/mips/cobalt/via.c linux-2.6.0-test1-printk-mips/arch/mips/cobalt/via.c --- linux-2.6.0-test1/arch/mips/cobalt/via.c 2003-07-13 23:29:27.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/cobalt/via.c 2003-07-16 20:19:17.000000000 -0400 @@ -44,11 +44,11 @@ outb(0x22, 0x20); outb((sstat & 0x7f) | 0x20, 0xA0); } else { - printk("Spurious slave interrupt...\n"); + printk(KERN_NOTICE "Spurious slave interrupt...\n"); } } } else - printk("Spurious master interrupt..."); + printk(KERN_NOTICE "Spurious master interrupt..."); } asmlinkage void galileo_irq(struct pt_regs *regs) @@ -63,5 +63,5 @@ GALILEO_OUTL(0, GT_INTRCAUSE_OFS); do_IRQ(COBALT_TIMER_IRQ, regs); } else - printk("Spurious Galileo interrupt...\n"); + printk(KERN_NOTICE "Spurious Galileo interrupt...\n"); } diff -urN linux-2.6.0-test1/arch/mips/ddb5xxx/common/irq.c linux-2.6.0-test1-printk-mips/arch/mips/ddb5xxx/common/irq.c --- linux-2.6.0-test1/arch/mips/ddb5xxx/common/irq.c 2003-07-13 23:36:41.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/ddb5xxx/common/irq.c 2003-07-17 20:13:27.000000000 -0400 @@ -23,7 +23,7 @@ extern void breakpoint(void); extern void set_debug_traps(void); - printk("Wait for gdb client connection ...\n"); + printk(KERN_INFO "Wait for gdb client connection ...\n"); set_debug_traps(); breakpoint(); #endif diff -urN linux-2.6.0-test1/arch/mips/ddb5xxx/common/prom.c linux-2.6.0-test1-printk-mips/arch/mips/ddb5xxx/common/prom.c --- linux-2.6.0-test1/arch/mips/ddb5xxx/common/prom.c 2003-07-13 23:37:27.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/ddb5xxx/common/prom.c 2003-07-17 20:13:39.000000000 -0400 @@ -132,7 +132,7 @@ */ board_ram_size = 1 << (36 - (ddb_in32(DDB_SDRAM0) & 0xf)); - db_run(printk("DDB run-time detection : %s, %d MB RAM\n", + db_run(printk(KERN_INFO "DDB run-time detection : %s, %d MB RAM\n", mips_machtype == MACH_NEC_DDB5477 ? "DDB5477" : "Rockhopper", board_ram_size >> 20)); diff -urN linux-2.6.0-test1/arch/mips/ddb5xxx/ddb5074/irq.c linux-2.6.0-test1-printk-mips/arch/mips/ddb5xxx/ddb5074/irq.c --- linux-2.6.0-test1/arch/mips/ddb5xxx/ddb5074/irq.c 2003-07-13 23:38:43.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/ddb5xxx/ddb5074/irq.c 2003-07-17 20:13:06.000000000 -0400 @@ -80,10 +80,10 @@ outb(0x0c, M1543_PNP_DATA); outb(0x30, M1543_PNP_INDEX); - printk("device 7, 0x30: %02x\n",inb(M1543_PNP_DATA)); + printk(KERN_INFO "device 7, 0x30: %02x\n",inb(M1543_PNP_DATA)); outb(0x70, M1543_PNP_INDEX); - printk("device 7, 0x70: %02x\n",inb(M1543_PNP_DATA)); + printk(KERN_INFO "device 7, 0x70: %02x\n",inb(M1543_PNP_DATA)); /* Leave configration mode */ outb(0xbb, M1543_PNP_CONFIG); @@ -121,17 +121,17 @@ void ddb_local1_irqdispatch(void) { - printk("ddb_local1_irqdispatch called\n"); + printk(KERN_NOTICE "ddb_local1_irqdispatch called\n"); } void ddb_buserror_irq(void) { - printk("ddb_buserror_irq called\n"); + printk(KERN_NOTICE "ddb_buserror_irq called\n"); } void ddb_8254timer_irq(void) { - printk("ddb_8254timer_irq called\n"); + printk(KERN_NOTICE "ddb_8254timer_irq called\n"); } void __init ddb_irq_setup(void) @@ -153,11 +153,11 @@ init_i8259_irqs(); - printk("CPU_IRQ_BASE: %d\n",CPU_IRQ_BASE); + printk(KERN_NOTICE "CPU_IRQ_BASE: %d\n",CPU_IRQ_BASE); mips_cpu_irq_init(CPU_IRQ_BASE); - printk("enabling 8259 cascade\n"); + printk(KERN_NOTICE "enabling 8259 cascade\n"); ddb5074_led_hex(0); diff -urN linux-2.6.0-test1/arch/mips/ddb5xxx/ddb5074/setup.c linux-2.6.0-test1-printk-mips/arch/mips/ddb5xxx/ddb5074/setup.c --- linux-2.6.0-test1/arch/mips/ddb5xxx/ddb5074/setup.c 2003-07-13 23:36:43.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/ddb5xxx/ddb5074/setup.c 2003-07-17 20:12:18.000000000 -0400 @@ -62,14 +62,14 @@ static void ddb_machine_halt(void) { - printk("DDB Vrc-5074 halted.\n"); + printk(KERN_NOTICE "DDB Vrc-5074 halted.\n"); do { } while (1); } static void ddb_machine_power_off(void) { - printk("DDB Vrc-5074 halted. Please turn off the power.\n"); + printk(KERN_NOTICE "DDB Vrc-5074 halted. Please turn off the power.\n"); do { } while (1); } diff -urN linux-2.6.0-test1/arch/mips/ddb5xxx/ddb5477/debug.c linux-2.6.0-test1-printk-mips/arch/mips/ddb5xxx/ddb5477/debug.c --- linux-2.6.0-test1/arch/mips/ddb5xxx/ddb5477/debug.c 2003-07-13 23:31:22.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/ddb5xxx/ddb5477/debug.c 2003-07-17 20:10:42.000000000 -0400 @@ -28,9 +28,9 @@ { int i; - printk("\nshow regs: %s\n", name); + printk(KERN_EMERG "\nshow regs: %s\n", name); for(i=0;regs[i].regname!= NULL; i++) { - printk("%-16s= %08x\t\t(@%08x)\n", + printk(KERN_EMERG "%-16s= %08x\t\t(@%08x)\n", regs[i].regname, *(unsigned *)(regs[i].regaddr), regs[i].regaddr); @@ -56,8 +56,8 @@ void vrc5477_show_int_regs() { jsun_show_regs("interrupt registers", int_regs); - printk("CPU CAUSE = %08x\n", read_c0_cause()); - printk("CPU STATUS = %08x\n", read_c0_status()); + printk(KERN_EMERG "CPU CAUSE = %08x\n", read_c0_cause()); + printk(KERN_EMERG "CPU STATUS = %08x\n", read_c0_status()); } static Register pdar_regs[] = { {"DDB_SDRAM0", DDB_BASE + DDB_SDRAM0}, diff -urN linux-2.6.0-test1/arch/mips/ddb5xxx/ddb5477/irq.c linux-2.6.0-test1-printk-mips/arch/mips/ddb5xxx/ddb5477/irq.c --- linux-2.6.0-test1/arch/mips/ddb5xxx/ddb5477/irq.c 2003-07-13 23:30:42.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/ddb5xxx/ddb5477/irq.c 2003-07-17 20:09:09.000000000 -0400 @@ -82,7 +82,7 @@ void ddb5477_irq_setup(void) { - db_run(printk("ddb5477_irq_setup invoked.\n")); + db_run(printk(KERN_NOTICE "ddb5477_irq_setup invoked.\n")); /* by default, we disable all interrupts and route all vrc5477 * interrupts to pin 0 (irq 2) */ diff -urN linux-2.6.0-test1/arch/mips/ddb5xxx/ddb5477/setup.c linux-2.6.0-test1-printk-mips/arch/mips/ddb5xxx/ddb5477/setup.c --- linux-2.6.0-test1/arch/mips/ddb5xxx/ddb5477/setup.c 2003-07-13 23:37:31.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/ddb5xxx/ddb5477/setup.c 2003-07-17 20:11:49.000000000 -0400 @@ -72,13 +72,13 @@ static void ddb_machine_halt(void) { - printk("DDB Vrc-5477 halted.\n"); + printk(KERN_NOTICE "DDB Vrc-5477 halted.\n"); while (1); } static void ddb_machine_power_off(void) { - printk("DDB Vrc-5477 halted. Please turn off the power.\n"); + printk(KERN_NOTICE "DDB Vrc-5477 halted. Please turn off the power.\n"); while (1); } @@ -99,7 +99,7 @@ c= *(volatile unsigned char*)rtc_base; for(i=0; (c == *(volatile unsigned char*)rtc_base) && (i<100000000); i++); if (c == *(volatile unsigned char*)rtc_base) { - printk("Failed to detect bus frequency. Use default 83.3MHz.\n"); + printk(KERN_INFO "Failed to detect bus frequency. Use default 83.3MHz.\n"); return 83333000; } @@ -118,7 +118,7 @@ ddb_out32(SP_TIMER_BASE+4, 0x0); /* disable it again */ freq = (t1 - t2)*10; - printk("DDB bus frequency detection : %u \n", freq); + printk(KERN_INFO "DDB bus frequency detection : %u \n", freq); return freq; } @@ -340,7 +340,7 @@ dev_m1533.devfn = 7*8; // slot 7: M1533 SouthBridge. pci_read_config_word(&dev_m1533, 0, &vid); if (vid == PCI_VENDOR_ID_AL) { - printk("Changing mips_machtype to MACH_NEC_ROCKHOPPERII\n"); + printk(KERN_INFO "Changing mips_machtype to MACH_NEC_ROCKHOPPERII\n"); mips_machtype = MACH_NEC_ROCKHOPPERII; } } @@ -354,7 +354,7 @@ if (mips_machtype == MACH_NEC_ROCKHOPPERII) { #ifdef CONFIG_PC_KEYB - printk("kdb_ops is std\n"); + printk(KERN_INFO "kdb_ops is std\n"); kbd_ops = &std_kbd_ops; #endif } @@ -427,7 +427,7 @@ if (mips_machtype == MACH_NEC_ROCKHOPPER || mips_machtype == MACH_NEC_ROCKHOPPERII) { - printk("lcd44780: initializing\n"); + printk(KERN_INFO "lcd44780: initializing\n"); lcd44780_init(); lcd44780_puts("MontaVista Linux"); } diff -urN linux-2.6.0-test1/arch/mips/dec/prom/memory.c linux-2.6.0-test1-printk-mips/arch/mips/dec/prom/memory.c --- linux-2.6.0-test1/arch/mips/dec/prom/memory.c 2003-07-13 23:28:51.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/dec/prom/memory.c 2003-07-16 15:33:56.000000000 -0400 @@ -123,6 +123,6 @@ addr += PAGE_SIZE; } - printk("Freeing unused PROM memory: %ldk freed\n", + printk(KERN_NOTICE "Freeing unused PROM memory: %ldk freed\n", (end - PAGE_SIZE) >> 10); } diff -urN linux-2.6.0-test1/arch/mips/dec/time.c linux-2.6.0-test1-printk-mips/arch/mips/dec/time.c --- linux-2.6.0-test1/arch/mips/dec/time.c 2003-07-13 23:37:17.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/dec/time.c 2003-07-16 15:35:33.000000000 -0400 @@ -107,7 +107,7 @@ /* .. relative to previous jiffy (32 bits is enough) */ count -= timerlo; -//printk("count: %08lx, %08lx:%08lx\n", count, timerhi, timerlo); +/* printk(KERN_DEBUG "count: %08lx, %08lx:%08lx\n", count, timerhi, timerlo); */ __asm__("multu %2,%3" : "=l" (tmp), "=h" (res) @@ -148,7 +148,7 @@ /* .. relative to previous jiffy (32 bits is enough) */ count -= timerlo; -//printk("count: %08x, %08x:%08x\n", count, timerhi, timerlo); +/* printk(KERN_DEBUG "count: %08x, %08x:%08x\n", count, timerhi, timerlo); */ __asm__("multu %2,%3" : "=l" (tmp), "=h" (res) diff -urN linux-2.6.0-test1/arch/mips/galileo-boards/ev64120/irq-handler.c linux-2.6.0-test1-printk-mips/arch/mips/galileo-boards/ev64120/irq-handler.c --- linux-2.6.0-test1/arch/mips/galileo-boards/ev64120/irq-handler.c 2003-07-13 23:37:31.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/galileo-boards/ev64120/irq-handler.c 2003-07-16 19:58:38.000000000 -0400 @@ -182,7 +182,7 @@ */ if (handled == 0) { if (counter < 50) { - printk("Spurious Galileo interrupt...\n"); + printk(KERN_NOTICE "Spurious Galileo interrupt...\n"); counter++; } } diff -urN linux-2.6.0-test1/arch/mips/galileo-boards/ev96100/init.c linux-2.6.0-test1-printk-mips/arch/mips/galileo-boards/ev96100/init.c --- linux-2.6.0-test1/arch/mips/galileo-boards/ev96100/init.c 2003-07-13 23:30:41.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/galileo-boards/ev96100/init.c 2003-07-16 19:56:18.000000000 -0400 @@ -133,18 +133,18 @@ ethaddr_str = prom_getenv("ethaddr"); if (!ethaddr_str) { - printk("ethaddr not set in boot prom\n"); + printk(KERN_WARNING "ethaddr not set in boot prom\n"); return -1; } str2eaddr(ethernet_addr, ethaddr_str); if (init_debug > 1) { int i; - printk("get_ethernet_addr: "); + printk(KERN_DEBUG "get_ethernet_addr: "); for (i = 0; i < 5; i++) - printk("%02x:", + printk(KERN_DEBUG "%02x:", (unsigned char) *(ethernet_addr + i)); - printk("%02x\n", *(ethernet_addr + i)); + printk(KERN_DEBUG "%02x\n", *(ethernet_addr + i)); } return 0; diff -urN linux-2.6.0-test1/arch/mips/galileo-boards/ev96100/setup.c linux-2.6.0-test1-printk-mips/arch/mips/galileo-boards/ev96100/setup.c --- linux-2.6.0-test1/arch/mips/galileo-boards/ev96100/setup.c 2003-07-13 23:35:16.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/galileo-boards/ev96100/setup.c 2003-07-16 19:57:55.000000000 -0400 @@ -79,56 +79,56 @@ clear_c0_status(ST0_FR); if (config & 0x8) { - printk("Secondary cache is enabled\n"); + printk(KERN_INFO "Secondary cache is enabled\n"); } else { - printk("Secondary cache is disabled\n"); + printk(KERN_INFO "Secondary cache is disabled\n"); } if (status & (1<<27)) { - printk("User-mode cache ops enabled\n"); + printk(KERN_INFO "User-mode cache ops enabled\n"); } else { - printk("User-mode cache ops disabled\n"); + printk(KERN_INFO "User-mode cache ops disabled\n"); } - printk("CP0 info reg: %x\n", (unsigned)info); + printk(KERN_INFO "CP0 info reg: %x\n", (unsigned)info); if (info & (1<<28)) { - printk("burst mode Scache RAMS\n"); + printk(KERN_INFO "burst mode Scache RAMS\n"); } else { - printk("pipelined Scache RAMS\n"); + printk(KERN_INFO "pipelined Scache RAMS\n"); } if ((info & (0x3<<26)) >> 26 == 0) { - printk("67 percent drive strength\n"); + printk(KERN_INFO "67 percent drive strength\n"); } else if ((info & (0x3<<26)) >> 26 == 1) { - printk("50 percent drive strength\n"); + printk(KERN_INFO "50 percent drive strength\n"); } else if ((info & (0x3<<26)) >> 26 == 2) { - printk("100 percent drive strength\n"); + printk(KERN_INFO "100 percent drive strength\n"); } else if ((info & (0x3<<26)) >> 26 == 3) { - printk("83 percent drive strength\n"); + printk(KERN_INFO "83 percent drive strength\n"); } if ((info & (0x3<<23)) >> 23 == 0) { - printk("Write Protocol: R4000 compatible\n"); + printk(KERN_INFO "Write Protocol: R4000 compatible\n"); } else if ((info & (0x3<<23)) >> 23 == 1) { - printk("Write Protocol: Reserved\n"); + printk(KERN_INFO "Write Protocol: Reserved\n"); } else if ((info & (0x3<<23)) >> 23 == 2) { - printk("Write Protocol: Pipelined\n"); + printk(KERN_INFO "Write Protocol: Pipelined\n"); } else if ((info & (0x3<<23)) >> 23 == 3) { - printk("Write Protocol: Write re-issue\n"); + printk(KERN_INFO "Write Protocol: Write re-issue\n"); } if (info & 0x1) { - printk("Atomic Enable is set\n"); + printk(KERN_INFO "Atomic Enable is set\n"); } argptr = prom_getcmdline(); diff -urN linux-2.6.0-test1/arch/mips/galileo-boards/ev96100/time.c linux-2.6.0-test1-printk-mips/arch/mips/galileo-boards/ev96100/time.c --- linux-2.6.0-test1/arch/mips/galileo-boards/ev96100/time.c 2003-07-13 23:34:30.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/galileo-boards/ev96100/time.c 2003-07-16 19:56:41.000000000 -0400 @@ -106,7 +106,7 @@ est_freq = 2*r4k_offset*HZ; est_freq += 5000; /* round */ est_freq -= est_freq%10000; - printk("CPU frequency %d.%02d MHz\n", est_freq/1000000, + printk(KERN_INFO "CPU frequency %d.%02d MHz\n", est_freq/1000000, (est_freq%1000000)*100/1000000); r4k_cur = (read_c0_count() + r4k_offset); diff -urN linux-2.6.0-test1/arch/mips/gt64120/common/gt_irq.c linux-2.6.0-test1-printk-mips/arch/mips/gt64120/common/gt_irq.c --- linux-2.6.0-test1/arch/mips/gt64120/common/gt_irq.c 2003-07-13 23:36:48.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/gt64120/common/gt_irq.c 2003-07-17 16:43:29.000000000 -0400 @@ -170,7 +170,7 @@ */ if (handled == 0) { if (counter < 50) { - printk("Spurious Galileo interrupt...\n"); + printk(KERN_NOTICE "Spurious Galileo interrupt...\n"); counter++; } } diff -urN linux-2.6.0-test1/arch/mips/gt64120/momenco_ocelot/irq.c linux-2.6.0-test1-printk-mips/arch/mips/gt64120/momenco_ocelot/irq.c --- linux-2.6.0-test1/arch/mips/gt64120/momenco_ocelot/irq.c 2003-07-13 23:28:55.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/gt64120/momenco_ocelot/irq.c 2003-07-17 16:42:15.000000000 -0400 @@ -163,7 +163,7 @@ gt64120_irq_init(); #ifdef CONFIG_REMOTE_DEBUG - printk("start kgdb ...\n"); + printk(KERN_DEBUG "start kgdb ...\n"); set_debug_traps(); breakpoint(); /* you may move this line to whereever you want :-) */ #endif diff -urN linux-2.6.0-test1/arch/mips/gt64120/momenco_ocelot/setup.c linux-2.6.0-test1-printk-mips/arch/mips/gt64120/momenco_ocelot/setup.c --- linux-2.6.0-test1/arch/mips/gt64120/momenco_ocelot/setup.c 2003-07-13 23:34:31.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/gt64120/momenco_ocelot/setup.c 2003-07-17 16:42:56.000000000 -0400 @@ -180,26 +180,26 @@ tmpword = OCELOT_PLD_READ(BOARDREV); if (tmpword < 26) - printk("Momenco Ocelot: Board Assembly Rev. %c\n", 'A'+tmpword); + printk(KERN_INFO "Momenco Ocelot: Board Assembly Rev. %c\n", 'A'+tmpword); else - printk("Momenco Ocelot: Board Assembly Revision #0x%x\n", tmpword); + printk(KERN_INFO "Momenco Ocelot: Board Assembly Revision #0x%x\n", tmpword); tmpword = OCELOT_PLD_READ(PLD1_ID); - printk("PLD 1 ID: %d.%d\n", tmpword>>4, tmpword&15); + printk(KERN_INFO "PLD 1 ID: %d.%d\n", tmpword>>4, tmpword&15); tmpword = OCELOT_PLD_READ(PLD2_ID); - printk("PLD 2 ID: %d.%d\n", tmpword>>4, tmpword&15); + printk(KERN_INFO "PLD 2 ID: %d.%d\n", tmpword>>4, tmpword&15); tmpword = OCELOT_PLD_READ(RESET_STATUS); - printk("Reset reason: 0x%x\n", tmpword); + printk(KERN_INFO "Reset reason: 0x%x\n", tmpword); reset_reason = tmpword; OCELOT_PLD_WRITE(0xff, RESET_STATUS); tmpword = OCELOT_PLD_READ(BOARD_STATUS); - printk("Board Status register: 0x%02x\n", tmpword); - printk(" - User jumper: %s\n", (tmpword & 0x80)?"installed":"absent"); - printk(" - Boot flash write jumper: %s\n", (tmpword&0x40)?"installed":"absent"); - printk(" - Tulip PHY %s connected\n", (tmpword&0x10)?"is":"not"); - printk(" - L3 Cache size: %d MiB\n", (1<<((tmpword&12) >> 2))&~1); - printk(" - SDRAM size: %d MiB\n", 1<<(6+(tmpword&3))); + printk(KERN_INFO "Board Status register: 0x%02x\n", tmpword); + printk(KERN_INFO " - User jumper: %s\n", (tmpword & 0x80)?"installed":"absent"); + printk(KERN_INFO " - Boot flash write jumper: %s\n", (tmpword&0x40)?"installed":"absent"); + printk(KERN_INFO " - Tulip PHY %s connected\n", (tmpword&0x10)?"is":"not"); + printk(KERN_INFO " - L3 Cache size: %d MiB\n", (1<<((tmpword&12) >> 2))&~1); + printk(KERN_INFO " - SDRAM size: %d MiB\n", 1<<(6+(tmpword&3))); if (tmpword&12) l3func((1<<(((tmpword&12) >> 2)+20))); @@ -234,7 +234,7 @@ int register i; unsigned long tmp; - printk("Enabling L3 cache..."); + printk(KERN_INFO "Enabling L3 cache..."); /* Enable the L3 cache in the GT64120A's CPU Configuration register */ GT_READ(0, &tmp); @@ -262,7 +262,7 @@ /* Let the RM7000 MM code know that the tertiary cache is enabled */ rm7k_tcache_enabled = 1; - printk("Done\n"); + printk(KERN_INFO "Done\n"); } diff -urN linux-2.6.0-test1/arch/mips/ite-boards/generic/irq.c linux-2.6.0-test1-printk-mips/arch/mips/ite-boards/generic/irq.c --- linux-2.6.0-test1/arch/mips/ite-boards/generic/irq.c 2003-07-13 23:34:40.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/ite-boards/generic/irq.c 2003-07-17 19:51:08.000000000 -0400 @@ -265,7 +265,7 @@ kstat_cpu(cpu).irqs[irq]++; #if 0 if (irq_desc[irq].handler && irq_desc[irq].handler->ack) { - // printk("invoking ack handler\n"); + // printk(KERN_NOTICE "invoking ack handler\n"); irq_desc[irq].handler->ack(irq); } #endif @@ -275,7 +275,7 @@ if (action && action->handler) { //mask_irq(1<handler %x\n", action->handler); + //printk(KERN_DEBUG "action->handler %x\n", action->handler); disable_it8172_irq(irq); //if (!(action->flags & SA_INTERRUPT)) local_irq_enable(); /* reenable ints */ do { @@ -292,7 +292,7 @@ else { spurious_count++; - printk("Unhandled interrupt %d, cause %x, disabled\n", + printk(KERN_WARNING "Unhandled interrupt %d, cause %x, disabled\n", (unsigned)irq, (unsigned)regs->cp0_cause); disable_it8172_irq(irq); } @@ -315,7 +315,7 @@ * there. */ - //printk("request_irq: %d handler %x\n", irq, handler); + //printk(KERN_DEBUG "request_irq: %d handler %x\n", irq, handler); if (irq >= NR_IRQS) return -EINVAL; @@ -368,7 +368,7 @@ enable_it8172_irq(irq); restore_flags(flags); #if 0 - printk("request_irq: status %x cause %x\n", + printk(KERN_NOTICE "request_irq: status %x cause %x\n", read_32bit_cp0_register(CP0_STATUS), read_32bit_cp0_register(CP0_CAUSE)); #endif return 0; @@ -469,11 +469,11 @@ #else unsigned long status, cause; - printk("got spurious interrupt\n"); + printk(KERN_NOTICE "got spurious interrupt\n"); status = read_32bit_cp0_register(CP0_STATUS); cause = read_32bit_cp0_register(CP0_CAUSE); - printk("status %x cause %x\n", status, cause); - printk("epc %x badvaddr %x \n", regs->cp0_epc, regs->cp0_badvaddr); + printk(KERN_NOTICE "status %x cause %x\n", status, cause); + printk(KERN_NOTICE "epc %x badvaddr %x \n", regs->cp0_epc, regs->cp0_badvaddr); // while(1); #endif } @@ -496,7 +496,7 @@ status >>= 1; } irq += IT8172_PCI_DEV_IRQ_BASE; - //printk("pci int %d\n", irq); + //printk(KERN_DEBUG "pci int %d\n", irq); } else if (intstatus & 0x1) { /* Local Bus interrupt */ @@ -507,7 +507,7 @@ status >>= 1; } irq += IT8172_LB_IRQ_BASE; - //printk("lb int %d\n", irq); + //printk(KERN_DEBUG "lb int %d\n", irq); } else if (intstatus & 0x2) { /* LPC interrupt */ @@ -523,7 +523,7 @@ status >>= 1; } irq += IT8172_LPC_IRQ_BASE; - //printk("LPC int %d\n", irq); + //printk(KERN_DEBUG "LPC int %d\n", irq); } else { return; diff -urN linux-2.6.0-test1/arch/mips/ite-boards/generic/it8172_cir.c linux-2.6.0-test1-printk-mips/arch/mips/ite-boards/generic/it8172_cir.c --- linux-2.6.0-test1/arch/mips/ite-boards/generic/it8172_cir.c 2003-07-13 23:32:33.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/ite-boards/generic/it8172_cir.c 2003-07-17 19:44:36.000000000 -0400 @@ -123,7 +123,7 @@ void dump_regs(struct cir_port *cir) { - printk("mstcr %x ier %x iir %x cfr %x rcr %x tcr %x tfsr %x rfsr %x\n", + printk(KERN_EMERG "mstcr %x ier %x iir %x cfr %x rcr %x tcr %x tfsr %x rfsr %x\n", cir_regs[cir->port]->mstcr, cir_regs[cir->port]->ier, cir_regs[cir->port]->iir, @@ -134,13 +134,13 @@ cir_regs[cir->port]->rfsr); while (cir_regs[cir->port]->iir & CIR_RDAI) { - printk("data %x\n", cir_regs[cir->port]->dr); + printk(KERN_EMERG "data %x\n", cir_regs[cir->port]->dr); } } void dump_reg_addr(struct cir_port *cir) { - printk("dr %x mstcr %x ier %x iir %x cfr %x rcr %x tcr %x bdlr %x bdhr %x tfsr %x rfsr %x\n", + printk(KERN_EMERG "dr %x mstcr %x ier %x iir %x cfr %x rcr %x tcr %x bdlr %x bdhr %x tfsr %x rfsr %x\n", (unsigned)&cir_regs[cir->port]->dr, (unsigned)&cir_regs[cir->port]->mstcr, (unsigned)&cir_regs[cir->port]->ier, diff -urN linux-2.6.0-test1/arch/mips/ite-boards/generic/it8172_pci.c linux-2.6.0-test1-printk-mips/arch/mips/ite-boards/generic/it8172_pci.c --- linux-2.6.0-test1/arch/mips/ite-boards/generic/it8172_pci.c 2003-07-13 23:36:37.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/ite-boards/generic/it8172_pci.c 2003-07-17 19:52:01.000000000 -0400 @@ -54,7 +54,7 @@ unsigned char dev_fn = (char)devfn; #ifdef DEBUG_CONFIG_CYCLES - printk("it config: type %d bus %d dev_fn %x data %x\n", + printk(KERN_DEBUG "it config: type %d bus %d dev_fn %x data %x\n", access_type, bus, dev_fn, *data); #endif @@ -103,7 +103,7 @@ *val = data; #ifdef DEBUG - printk("cfg read: bus %d devfn %x where %x size %x: val %x\n", + printk(KERN_DEBUG "cfg read: bus %d devfn %x where %x size %x: val %x\n", bus->number, devfn, where, size, *val); #endif @@ -147,7 +147,7 @@ void __init pcibios_init(void) { - printk("PCI: Probing PCI hardware on host bus 0.\n"); + printk(KERN_INFO "PCI: Probing PCI hardware on host bus 0.\n"); pci_scan_bus(0, &it8172_pci_ops, NULL); } @@ -174,7 +174,7 @@ if (dev->resource[PCI_ROM_RESOURCE].start) cmd |= PCI_COMMAND_MEMORY; if (cmd != old_cmd) { - printk("PCI: Enabling device %s (%04x -> %04x)\n", dev->slot_name, old_cmd, cmd); + printk(KERN_INFO "PCI: Enabling device %s (%04x -> %04x)\n", dev->slot_name, old_cmd, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); } return 0; @@ -185,7 +185,7 @@ pcibios_align_resource(void *data, struct resource *res, unsigned long size, unsigned long align) { - printk("pcibios_align_resource\n"); + printk(KERN_INFO "pcibios_align_resource\n"); } char * __init @@ -200,7 +200,7 @@ void __init pcibios_fixup_bus(struct pci_bus *b) { - //printk("pcibios_fixup_bus\n"); + //printk(KERN_INFO "pcibios_fixup_bus\n"); } unsigned __init int pcibios_assign_all_busses(void) diff -urN linux-2.6.0-test1/arch/mips/ite-boards/generic/it8172_setup.c linux-2.6.0-test1-printk-mips/arch/mips/ite-boards/generic/it8172_setup.c --- linux-2.6.0-test1/arch/mips/ite-boards/generic/it8172_setup.c 2003-07-13 23:33:13.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/ite-boards/generic/it8172_setup.c 2003-07-17 19:45:40.000000000 -0400 @@ -178,13 +178,13 @@ #ifdef CONFIG_MIPS_ITE8172 if (SearchIT8712()) { - printk("Found IT8712 Super IO\n"); + printk(KERN_INFO "Found IT8712 Super IO\n"); // enable IT8712 serial port LPCSetConfig(LDN_SERIAL1, 0x30, 0x01); /* enable */ LPCSetConfig(LDN_SERIAL1, 0x23, 0x01); /* clock selection */ #ifdef CONFIG_PC_KEYB if (init_8712_keyboard()) { - printk("Unable to initialize keyboard\n"); + printk(KERN_INFO "Unable to initialize keyboard\n"); LPCSetConfig(LDN_KEYBOARD, 0x30, 0x0); /* disable keyboard */ } else { @@ -199,25 +199,25 @@ if ((LPCGetConfig(LDN_KEYBOARD, 0x30) == 0) || (LPCGetConfig(LDN_MOUSE, 0x30) == 0)) - printk("Error: keyboard or mouse not enabled\n"); + printk(KERN_ERR "Error: keyboard or mouse not enabled\n"); kbd_ops = &std_kbd_ops; } #endif } else { - printk("IT8712 Super IO not found\n"); + printk(KERN_WARNING "IT8712 Super IO not found\n"); } #endif #ifdef CONFIG_IT8172_CIR { unsigned long data; - //printk("Enabling CIR0\n"); + //printk(KERN_INFO "Enabling CIR0\n"); IT_IO_READ16(IT_PM_DSR, data); data &= ~IT_PM_DSR_CIR0SB; IT_IO_WRITE16(IT_PM_DSR, data); - //printk("DSR register: %x\n", (unsigned)IT_IO_READ16(IT_PM_DSR, data)); + //printk(KERN_INFO "DSR register: %x\n", (unsigned)IT_IO_READ16(IT_PM_DSR, data)); } #endif #ifdef CONFIG_IT8172_SCR0 diff -urN linux-2.6.0-test1/arch/mips/ite-boards/generic/pmon_prom.c linux-2.6.0-test1-printk-mips/arch/mips/ite-boards/generic/pmon_prom.c --- linux-2.6.0-test1/arch/mips/ite-boards/generic/pmon_prom.c 2003-07-13 23:34:33.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/ite-boards/generic/pmon_prom.c 2003-07-17 19:46:26.000000000 -0400 @@ -134,9 +134,9 @@ #else memsize = 8; #endif - printk("memsize unknown: setting to %dMB\n", memsize); + printk(KERN_INFO "memsize unknown: setting to %dMB\n", memsize); } else { - printk("memsize: %s\n", memsize_str); + printk(KERN_INFO "memsize: %s\n", memsize_str); memsize = simple_strtol(memsize_str, NULL, 0); } return memsize; diff -urN linux-2.6.0-test1/arch/mips/ite-boards/generic/time.c linux-2.6.0-test1-printk-mips/arch/mips/ite-boards/generic/time.c --- linux-2.6.0-test1/arch/mips/ite-boards/generic/time.c 2003-07-13 23:33:25.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/ite-boards/generic/time.c 2003-07-17 19:46:08.000000000 -0400 @@ -237,14 +237,14 @@ /* Set Data mode - binary. */ CMOS_WRITE(CMOS_READ(RTC_CONTROL) | RTC_DM_BINARY, RTC_CONTROL); - printk("calculating r4koff... "); + printk(KERN_INFO "calculating r4koff... "); r4k_offset = cal_r4koff(); - printk("%08lx(%d)\n", r4k_offset, (int) r4k_offset); + printk(KERN_INFO "%08lx(%d)\n", r4k_offset, (int) r4k_offset); est_freq = 2*r4k_offset*HZ; est_freq += 5000; /* round */ est_freq -= est_freq%10000; - printk("CPU frequency %d.%02d MHz\n", est_freq/1000000, + printk(KERN_INFO "CPU frequency %d.%02d MHz\n", est_freq/1000000, (est_freq%1000000)*100/1000000); r4k_cur = (read_32bit_cp0_register(CP0_COUNT) + r4k_offset); diff -urN linux-2.6.0-test1/arch/mips/ite-boards/ivr/pci_fixup.c linux-2.6.0-test1-printk-mips/arch/mips/ite-boards/ivr/pci_fixup.c --- linux-2.6.0-test1/arch/mips/ite-boards/ivr/pci_fixup.c 2003-07-13 23:37:18.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/ite-boards/ivr/pci_fixup.c 2003-07-17 19:52:22.000000000 -0400 @@ -55,7 +55,7 @@ }; #ifdef DEBUG - printk("board_int_line_fixup bus %d\n", dev->bus->number); + printk(KERN_DEBUG "board_int_line_fixup bus %d\n", dev->bus->number); #endif if (dev->bus->number != 0) return; @@ -125,7 +125,7 @@ } #ifdef DEBUG - printk("irq fixup: slot %d, vendor %x, int line %d, int number %d\n", + printk(KERN_DEBUG "irq fixup: slot %d, vendor %x, int line %d, int number %d\n", slot, vendor, pin, dev->irq); #endif pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq); diff -urN linux-2.6.0-test1/arch/mips/ite-boards/qed-4n-s01b/init.c linux-2.6.0-test1-printk-mips/arch/mips/ite-boards/qed-4n-s01b/init.c --- linux-2.6.0-test1/arch/mips/ite-boards/qed-4n-s01b/init.c 2003-07-13 23:39:21.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/ite-boards/qed-4n-s01b/init.c 2003-07-17 19:43:32.000000000 -0400 @@ -70,7 +70,7 @@ prom_init_cmdline(); mem_size = prom_get_memsize(); - printk("Memory size: %dMB\n", (unsigned)mem_size); + printk(KERN_INFO "Memory size: %dMB\n", (unsigned)mem_size); mem_size <<= 20; /* MB */ diff -urN linux-2.6.0-test1/arch/mips/ite-boards/qed-4n-s01b/pci_fixup.c linux-2.6.0-test1-printk-mips/arch/mips/ite-boards/qed-4n-s01b/pci_fixup.c --- linux-2.6.0-test1/arch/mips/ite-boards/qed-4n-s01b/pci_fixup.c 2003-07-13 23:32:28.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/ite-boards/qed-4n-s01b/pci_fixup.c 2003-07-17 19:43:11.000000000 -0400 @@ -55,7 +55,7 @@ }; #ifdef DEBUG - printk("board_int_line_fixup bus %d\n", dev->bus->number); + printk(KERN_DEBUG "board_int_line_fixup bus %d\n", dev->bus->number); #endif if (dev->bus->number != 0) return; @@ -183,7 +183,7 @@ } #ifdef DEBUG - printk("irq fixup: slot %d, vendor %x, int line %d, int number %d\n", + printk(KERN_DEBUG "irq fixup: slot %d, vendor %x, int line %d, int number %d\n", slot, vendor, pin, dev->irq); #endif pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq); diff -urN linux-2.6.0-test1/arch/mips/jazz/jazzdma.c linux-2.6.0-test1-printk-mips/arch/mips/jazz/jazzdma.c --- linux-2.6.0-test1/arch/mips/jazz/jazzdma.c 2003-07-13 23:38:38.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/jazz/jazzdma.c 2003-07-16 16:01:46.000000000 -0400 @@ -80,7 +80,7 @@ r4030_write_reg32(JAZZ_R4030_TRSTBL_LIM, VDMA_PGTBL_SIZE); r4030_write_reg32(JAZZ_R4030_TRSTBL_INV, 0); - printk("VDMA: R4030 DMA pagetables initialized.\n"); + printk(KERN_INFO "VDMA: R4030 DMA pagetables initialized.\n"); } /* @@ -102,13 +102,13 @@ if (paddr > 0x1fffffff) { if (vdma_debug) - printk("vdma_alloc: Invalid physical address: %08lx\n", + printk(KERN_ERR "vdma_alloc: Invalid physical address: %08lx\n", paddr); return VDMA_ERROR; /* invalid physical address */ } if (size > 0x400000 || size == 0) { if (vdma_debug) - printk("vdma_alloc: Invalid size: %08lx\n", size); + printk(KERN_ERR "vdma_alloc: Invalid size: %08lx\n", size); return VDMA_ERROR; /* invalid physical address */ } @@ -154,20 +154,20 @@ if (vdma_debug > 1) printk - ("vdma_alloc: Allocated %d pages starting from %08lx\n", + (KERN_DEBUG "vdma_alloc: Allocated %d pages starting from %08lx\n", pages, laddr); if (vdma_debug > 2) { - printk("LADDR: "); + printk(KERN_DEBUG "LADDR: "); for (i = first; i < last; i++) - printk("%08x ", i << 12); - printk("\nPADDR: "); + printk(KERN_DEBUG "%08x ", i << 12); + printk(KERN_DEBUG "\nPADDR: "); for (i = first; i < last; i++) - printk("%08x ", entry[i].frame); - printk("\nOWNER: "); + printk(KERN_DEBUG "%08x ", entry[i].frame); + printk(KERN_DEBUG "\nOWNER: "); for (i = first; i < last; i++) - printk("%08x ", entry[i].owner); - printk("\n"); + printk(KERN_DEBUG "%08x ", entry[i].owner); + printk(KERN_DEBUG "\n"); } restore_flags(flags); @@ -189,7 +189,7 @@ if (pgtbl[i].owner != laddr) { printk - ("vdma_free: trying to free other's dma pages, laddr=%8lx\n", + (KERN_ERR "vdma_free: trying to free other's dma pages, laddr=%8lx\n", laddr); return -1; } @@ -200,7 +200,7 @@ } if (vdma_debug > 1) - printk("vdma_free: freed %ld pages starting from %08lx\n", + printk(KERN_DEBUG "vdma_free: freed %ld pages starting from %08lx\n", i - (laddr >> 12), laddr); return 0; @@ -220,14 +220,14 @@ if (laddr > 0xffffff) { if (vdma_debug) printk - ("vdma_map: Invalid logical address: %08lx\n", + (KERN_DEBUG "vdma_map: Invalid logical address: %08lx\n", laddr); return -EINVAL; /* invalid logical address */ } if (paddr > 0x1fffffff) { if (vdma_debug) printk - ("vdma_map: Invalid physical address: %08lx\n", + (KERN_DEBUG "vdma_map: Invalid physical address: %08lx\n", paddr); return -EINVAL; /* invalid physical address */ } @@ -236,10 +236,10 @@ (((paddr & (VDMA_PAGESIZE - 1)) + size) >> 12) + 1; first = laddr >> 12; if (vdma_debug) - printk("vdma_remap: first=%x, pages=%x\n", first, pages); + printk(KERN_DEBUG "vdma_remap: first=%x, pages=%x\n", first, pages); if (first + pages > VDMA_PGTBL_ENTRIES) { if (vdma_debug) - printk("vdma_alloc: Invalid size: %08lx\n", size); + printk(KERN_DEBUG "vdma_alloc: Invalid size: %08lx\n", size); return -EINVAL; } @@ -247,7 +247,7 @@ while (pages > 0 && first < VDMA_PGTBL_ENTRIES) { if (pgtbl[first].owner != laddr) { if (vdma_debug) - printk("Trying to remap other's pages.\n"); + printk(KERN_DEBUG "Trying to remap other's pages.\n"); return -EPERM; /* not owner */ } pgtbl[first].frame = paddr; @@ -265,16 +265,16 @@ int i; pages = (((paddr & (VDMA_PAGESIZE - 1)) + size) >> 12) + 1; first = laddr >> 12; - printk("LADDR: "); + printk(KERN_DEBUG "LADDR: "); for (i = first; i < first + pages; i++) - printk("%08x ", i << 12); - printk("\nPADDR: "); + printk(KERN_DEBUG "%08x ", i << 12); + printk(KERN_DEBUG "\nPADDR: "); for (i = first; i < first + pages; i++) - printk("%08x ", pgtbl[i].frame); - printk("\nOWNER: "); + printk(KERN_DEBUG "%08x ", pgtbl[i].frame); + printk(KERN_DEBUG "\nOWNER: "); for (i = first; i < first + pages; i++) - printk("%08x ", pgtbl[i].owner); - printk("\n"); + printk(KERN_DEBUG "%08x ", pgtbl[i].owner); + printk(KERN_DEBUG "\n"); } return 0; @@ -323,34 +323,34 @@ { int i; - printk("vdma_stats: CONFIG: %08x\n", + printk(KERN_NOTICE "vdma_stats: CONFIG: %08x\n", r4030_read_reg32(JAZZ_R4030_CONFIG)); - printk("R4030 translation table base: %08x\n", + printk(KERN_NOTICE "R4030 translation table base: %08x\n", r4030_read_reg32(JAZZ_R4030_TRSTBL_BASE)); - printk("R4030 translation table limit: %08x\n", + printk(KERN_NOTICE "R4030 translation table limit: %08x\n", r4030_read_reg32(JAZZ_R4030_TRSTBL_LIM)); - printk("vdma_stats: INV_ADDR: %08x\n", + printk(KERN_NOTICE "vdma_stats: INV_ADDR: %08x\n", r4030_read_reg32(JAZZ_R4030_INV_ADDR)); - printk("vdma_stats: R_FAIL_ADDR: %08x\n", + printk(KERN_NOTICE "vdma_stats: R_FAIL_ADDR: %08x\n", r4030_read_reg32(JAZZ_R4030_R_FAIL_ADDR)); - printk("vdma_stats: M_FAIL_ADDR: %08x\n", + printk(KERN_NOTICE "vdma_stats: M_FAIL_ADDR: %08x\n", r4030_read_reg32(JAZZ_R4030_M_FAIL_ADDR)); - printk("vdma_stats: IRQ_SOURCE: %08x\n", + printk(KERN_NOTICE "vdma_stats: IRQ_SOURCE: %08x\n", r4030_read_reg32(JAZZ_R4030_IRQ_SOURCE)); - printk("vdma_stats: I386_ERROR: %08x\n", + printk(KERN_NOTICE "vdma_stats: I386_ERROR: %08x\n", r4030_read_reg32(JAZZ_R4030_I386_ERROR)); - printk("vdma_chnl_modes: "); + printk(KERN_NOTICE "vdma_chnl_modes: "); for (i = 0; i < 8; i++) - printk("%04x ", + printk(KERN_NOTICE "%04x ", (unsigned) r4030_read_reg32(JAZZ_R4030_CHNL_MODE + (i << 5))); - printk("\n"); - printk("vdma_chnl_enables: "); + printk(KERN_NOTICE "\n"); + printk(KERN_NOTICE "vdma_chnl_enables: "); for (i = 0; i < 8; i++) - printk("%04x ", + printk(KERN_NOTICE "%04x ", (unsigned) r4030_read_reg32(JAZZ_R4030_CHNL_ENABLE + (i << 5))); - printk("\n"); + printk(KERN_NOTICE "\n"); } /* @@ -365,16 +365,16 @@ int status; if (vdma_debug) - printk("vdma_enable: channel %d\n", channel); + printk(KERN_DEBUG "vdma_enable: channel %d\n", channel); /* * Check error conditions first */ status = r4030_read_reg32(JAZZ_R4030_CHNL_ENABLE + (channel << 5)); if (status & 0x400) - printk("VDMA: Channel %d: Address error!\n", channel); + printk(KERN_ERR "VDMA: Channel %d: Address error!\n", channel); if (status & 0x200) - printk("VDMA: Channel %d: Memory error!\n", channel); + printk(KERN_ERR "VDMA: Channel %d: Memory error!\n", channel); /* * Clear all interrupt flags @@ -403,8 +403,8 @@ r4030_read_reg32(JAZZ_R4030_CHNL_ENABLE + (channel << 5)); - printk("vdma_disable: channel %d\n", channel); - printk("VDMA: channel %d status: %04x (%s) mode: " + printk(KERN_DEBUG "vdma_disable: channel %d\n", channel); + printk(KERN_DEBUG "VDMA: channel %d status: %04x (%s) mode: " "%02x addr: %06x count: %06x\n", channel, status, ((status & 0x600) ? "ERROR" : "OK"), @@ -440,7 +440,7 @@ void vdma_set_mode(int channel, int mode) { if (vdma_debug) - printk("vdma_set_mode: channel %d, mode 0x%x\n", channel, + printk(KERN_DEBUG "vdma_set_mode: channel %d, mode 0x%x\n", channel, mode); switch (channel) { @@ -464,12 +464,12 @@ case JAZZ_AUDIOL_DMA: case JAZZ_AUDIOR_DMA: - printk("VDMA: Audio DMA not supported yet.\n"); + printk(KERN_WARNING "VDMA: Audio DMA not supported yet.\n"); break; default: printk - ("VDMA: vdma_set_mode() called with unsupported channel %d!\n", + (KERN_ERR "VDMA: vdma_set_mode() called with unsupported channel %d!\n", channel); } @@ -490,7 +490,7 @@ default: printk - ("VDMA: vdma_set_mode() called with unknown dma mode 0x%x\n", + (KERN_ERR "VDMA: vdma_set_mode() called with unknown dma mode 0x%x\n", mode); } } @@ -501,7 +501,7 @@ void vdma_set_addr(int channel, long addr) { if (vdma_debug) - printk("vdma_set_addr: channel %d, addr %lx\n", channel, + printk(KERN_DEBUG "vdma_set_addr: channel %d, addr %lx\n", channel, addr); r4030_write_reg32(JAZZ_R4030_CHNL_ADDR + (channel << 5), addr); @@ -513,7 +513,7 @@ void vdma_set_count(int channel, int count) { if (vdma_debug) - printk("vdma_set_count: channel %d, count %08x\n", channel, + printk(KERN_DEBUG "vdma_set_count: channel %d, count %08x\n", channel, (unsigned) count); r4030_write_reg32(JAZZ_R4030_CHNL_COUNT + (channel << 5), count); @@ -530,7 +530,7 @@ r4030_read_reg32(JAZZ_R4030_CHNL_COUNT + (channel << 5)); if (vdma_debug) - printk("vdma_get_residual: channel %d: residual=%d\n", + printk(KERN_DEBUG "vdma_get_residual: channel %d: residual=%d\n", channel, residual); return residual; @@ -546,7 +546,7 @@ enable = r4030_read_reg32(JAZZ_R4030_CHNL_ENABLE + (channel << 5)); if (vdma_debug) - printk("vdma_get_enable: channel %d: enable=%d\n", channel, + printk(KERN_DEBUG "vdma_get_enable: channel %d: enable=%d\n", channel, enable); return enable; diff -urN linux-2.6.0-test1/arch/mips/jmr3927/rbhma3100/setup.c linux-2.6.0-test1-printk-mips/arch/mips/jmr3927/rbhma3100/setup.c --- linux-2.6.0-test1/arch/mips/jmr3927/rbhma3100/setup.c 2003-07-13 23:38:00.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/jmr3927/rbhma3100/setup.c 2003-07-17 20:03:49.000000000 -0400 @@ -342,13 +342,13 @@ if (jmr3927_have_isac()) jmr3927_io_led_set(0); - printk("JMR-TX3927 (Rev %d) --- IOC(Rev %d) DIPSW:%d,%d,%d,%d\n", + printk(KERN_INFO "JMR-TX3927 (Rev %d) --- IOC(Rev %d) DIPSW:%d,%d,%d,%d\n", jmr3927_ioc_reg_in(JMR3927_IOC_BREV_ADDR) & JMR3927_REV_MASK, jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR) & JMR3927_REV_MASK, jmr3927_dipsw1(), jmr3927_dipsw2(), jmr3927_dipsw3(), jmr3927_dipsw4()); if (jmr3927_have_isac()) - printk("JMI-3927IO2 --- ISAC(Rev %d) DIPSW:%01x\n", + printk(KERN_INFO "JMI-3927IO2 --- ISAC(Rev %d) DIPSW:%01x\n", jmr3927_isac_reg_in(JMR3927_ISAC_REV_ADDR) & JMR3927_REV_MASK, jmr3927_io_dipsw()); } @@ -386,7 +386,7 @@ TX3927_PCFG_SELSIOC(0) | TX3927_PCFG_SELSIO_ALL | (TX3927_PCFG_SELDMA_ALL & ~TX3927_PCFG_SELDMA(1)); - printk("TX3927 -- CRIR:%08lx CCFG:%08lx PCFG:%08lx\n", + printk(KERN_INFO "TX3927 -- CRIR:%08lx CCFG:%08lx PCFG:%08lx\n", tx3927_ccfgptr->crir, tx3927_ccfgptr->ccfg, tx3927_ccfgptr->pcfg); @@ -430,14 +430,14 @@ #ifdef CONFIG_PCI /* PCIC */ - printk("TX3927 PCIC -- DID:%04x VID:%04x RID:%02x Arbiter:", + printk(KERN_INFO "TX3927 PCIC -- DID:%04x VID:%04x RID:%02x Arbiter:", tx3927_pcicptr->did, tx3927_pcicptr->vid, tx3927_pcicptr->rid); if (!(tx3927_ccfgptr->ccfg & TX3927_CCFG_PCIXARB)) { - printk("External\n"); + printk(KERN_INFO "External\n"); /* XXX */ } else { - printk("Internal\n"); + printk(KERN_INFO "Internal\n"); /* Reset PCI Bus */ jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR); @@ -515,14 +515,14 @@ conf = read_c0_conf(); if (!(conf & TX39_CONF_ICE)) - printk("TX3927 I-Cache disabled.\n"); + printk(KERN_INFO "TX3927 I-Cache disabled.\n"); if (!(conf & TX39_CONF_DCE)) - printk("TX3927 D-Cache disabled.\n"); + printk(KERN_INFO "TX3927 D-Cache disabled.\n"); else if (!(conf & TX39_CONF_WBON)) - printk("TX3927 D-Cache WriteThrough.\n"); + printk(KERN_INFO "TX3927 D-Cache WriteThrough.\n"); else if (!(conf & TX39_CONF_CWFON)) - printk("TX3927 D-Cache WriteBack.\n"); + printk(KERN_INFO "TX3927 D-Cache WriteBack.\n"); else - printk("TX3927 D-Cache WriteBack (CWF) .\n"); + printk(KERN_INFO "TX3927 D-Cache WriteBack (CWF) .\n"); } } diff -urN linux-2.6.0-test1/arch/mips/kernel/branch.c linux-2.6.0-test1-printk-mips/arch/mips/kernel/branch.c --- linux-2.6.0-test1/arch/mips/kernel/branch.c 2003-07-13 23:34:30.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/kernel/branch.c 2003-07-17 17:32:38.000000000 -0400 @@ -195,7 +195,7 @@ return 0; unaligned: - printk("%s: unaligned epc - sending SIGBUS.\n", current->comm); + printk(KERN_ERR "%s: unaligned epc - sending SIGBUS.\n", current->comm); force_sig(SIGBUS, current); return -EFAULT; } diff -urN linux-2.6.0-test1/arch/mips/kernel/cpu-probe.c linux-2.6.0-test1-printk-mips/arch/mips/kernel/cpu-probe.c --- linux-2.6.0-test1/arch/mips/kernel/cpu-probe.c 2003-07-13 23:32:40.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/kernel/cpu-probe.c 2003-07-17 16:54:33.000000000 -0400 @@ -55,16 +55,16 @@ { struct cpuinfo_mips *c = ¤t_cpu_data; - printk("Checking for 'wait' instruction... "); + printk(KERN_NOTICE "Checking for 'wait' instruction... "); switch (c->cputype) { case CPU_R3081: case CPU_R3081E: cpu_wait = r3081_wait; - printk(" available.\n"); + printk(KERN_NOTICE " available.\n"); break; case CPU_TX3927: cpu_wait = r39xx_wait; - printk(" available.\n"); + printk(KERN_NOTICE " available.\n"); break; case CPU_R4200: /* case CPU_R4300: */ @@ -82,16 +82,16 @@ case CPU_5KC: /* case CPU_20KC:*/ cpu_wait = r4k_wait; - printk(" available.\n"); + printk(KERN_NOTICE " available.\n"); break; case CPU_AU1000: case CPU_AU1100: case CPU_AU1500: cpu_wait = au1k_wait; - printk(" available.\n"); + printk(KERN_NOTICE " available.\n"); break; default: - printk(" unavailable.\n"); + printk(KERN_NOTICE " unavailable.\n"); break; } } @@ -503,7 +503,7 @@ { struct cpuinfo_mips *c = ¤t_cpu_data; - printk("CPU revision is: %08x\n", c->processor_id); + printk(KERN_INFO "CPU revision is: %08x\n", c->processor_id); if (c->options & MIPS_CPU_FPU) - printk("FPU revision is: %08x\n", c->fpu_id); + printk(KERN_INFO "FPU revision is: %08x\n", c->fpu_id); } diff -urN linux-2.6.0-test1/arch/mips/kernel/gdb-stub.c linux-2.6.0-test1-printk-mips/arch/mips/kernel/gdb-stub.c --- linux-2.6.0-test1/arch/mips/kernel/gdb-stub.c 2003-07-13 23:38:52.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/kernel/gdb-stub.c 2003-07-17 17:54:34.000000000 -0400 @@ -444,23 +444,23 @@ /* * Saved main processor registers */ - printk("$0 : %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", + printk(KERN_DEBUG "$0 : %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", regs->reg0, regs->reg1, regs->reg2, regs->reg3, regs->reg4, regs->reg5, regs->reg6, regs->reg7); - printk("$8 : %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", + printk(KERN_DEBUG "$8 : %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", regs->reg8, regs->reg9, regs->reg10, regs->reg11, regs->reg12, regs->reg13, regs->reg14, regs->reg15); - printk("$16: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", + printk(KERN_DEBUG "$16: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", regs->reg16, regs->reg17, regs->reg18, regs->reg19, regs->reg20, regs->reg21, regs->reg22, regs->reg23); - printk("$24: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", + printk(KERN_DEBUG "$24: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", regs->reg24, regs->reg25, regs->reg26, regs->reg27, regs->reg28, regs->reg29, regs->reg30, regs->reg31); /* * Saved cp0 registers */ - printk("epc : %08lx\nStatus: %08lx\nCause : %08lx\n", + printk(KERN_DEBUG "epc : %08lx\nStatus: %08lx\nCause : %08lx\n", regs->cp0_epc, regs->cp0_status, regs->cp0_cause); } #endif /* dead code */ diff -urN linux-2.6.0-test1/arch/mips/kernel/i8259.c linux-2.6.0-test1-printk-mips/arch/mips/kernel/i8259.c --- linux-2.6.0-test1/arch/mips/kernel/i8259.c 2003-07-13 23:30:48.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/kernel/i8259.c 2003-07-17 16:51:00.000000000 -0400 @@ -209,7 +209,7 @@ * lets ACK and report it. [once per IRQ] */ if (!(spurious_irq_mask & irqmask)) { - printk("spurious 8259A interrupt: IRQ%d.\n", irq); + printk(KERN_NOTICE "spurious 8259A interrupt: IRQ%d.\n", irq); spurious_irq_mask |= irqmask; } atomic_inc(&irq_err_count); diff -urN linux-2.6.0-test1/arch/mips/kernel/irixelf.c linux-2.6.0-test1-printk-mips/arch/mips/kernel/irixelf.c --- linux-2.6.0-test1/arch/mips/kernel/irixelf.c 2003-07-13 23:39:37.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/kernel/irixelf.c 2003-07-17 18:00:42.000000000 -0400 @@ -79,31 +79,31 @@ { int i; - printk("ELFHDR: e_ident<"); - for(i = 0; i < (EI_NIDENT - 1); i++) printk("%x ", ehp->e_ident[i]); - printk("%x>\n", ehp->e_ident[i]); - printk(" e_type[%04x] e_machine[%04x] e_version[%08lx]\n", + printk(KERN_DEBUG "ELFHDR: e_ident<"); + for(i = 0; i < (EI_NIDENT - 1); i++) printk(KERN_DEBUG "%x ", ehp->e_ident[i]); + printk(KERN_DEBUG "%x>\n", ehp->e_ident[i]); + printk(KERN_DEBUG " e_type[%04x] e_machine[%04x] e_version[%08lx]\n", (unsigned short) ehp->e_type, (unsigned short) ehp->e_machine, (unsigned long) ehp->e_version); - printk(" e_entry[%08lx] e_phoff[%08lx] e_shoff[%08lx] " + printk(KERN_DEBUG " e_entry[%08lx] e_phoff[%08lx] e_shoff[%08lx] " "e_flags[%08lx]\n", (unsigned long) ehp->e_entry, (unsigned long) ehp->e_phoff, (unsigned long) ehp->e_shoff, (unsigned long) ehp->e_flags); - printk(" e_ehsize[%04x] e_phentsize[%04x] e_phnum[%04x]\n", + printk(KERN_DEBUG " e_ehsize[%04x] e_phentsize[%04x] e_phnum[%04x]\n", (unsigned short) ehp->e_ehsize, (unsigned short) ehp->e_phentsize, (unsigned short) ehp->e_phnum); - printk(" e_shentsize[%04x] e_shnum[%04x] e_shstrndx[%04x]\n", + printk(KERN_DEBUG " e_shentsize[%04x] e_shnum[%04x] e_shstrndx[%04x]\n", (unsigned short) ehp->e_shentsize, (unsigned short) ehp->e_shnum, (unsigned short) ehp->e_shstrndx); } static void print_phdr(int i, struct elf_phdr *ep) { - printk("PHDR[%d]: p_type[%s] p_offset[%08lx] p_vaddr[%08lx] " + printk(KERN_DEBUG "PHDR[%d]: p_type[%s] p_offset[%08lx] p_vaddr[%08lx] " "p_paddr[%08lx]\n", i, get_elf_p_type(ep->p_type), (unsigned long) ep->p_offset, (unsigned long) ep->p_vaddr, (unsigned long) ep->p_paddr); - printk(" p_filesz[%08lx] p_memsz[%08lx] p_flags[%08lx] " + printk(KERN_DEBUG " p_filesz[%08lx] p_memsz[%08lx] p_flags[%08lx] " "p_align[%08lx]\n", (unsigned long) ep->p_filesz, (unsigned long) ep->p_memsz, (unsigned long) ep->p_flags, (unsigned long) ep->p_align); @@ -158,7 +158,7 @@ elf_addr_t *sp, *csp; #ifdef DEBUG_ELF - printk("create_irix_tables: p[%p] argc[%d] envc[%d] " + printk(KERN_DEBUG "create_irix_tables: p[%p] argc[%d] envc[%d] " "load_addr[%08x] interp_load_addr[%08x]\n", p, argc, envc, load_addr, interp_load_addr); #endif @@ -255,13 +255,13 @@ interp_elf_ex->e_type != ET_DYN) || !irix_elf_check_arch(interp_elf_ex) || !interpreter->f_op->mmap) { - printk("IRIX interp has bad e_type %d\n", interp_elf_ex->e_type); + printk(KERN_ERR "IRIX interp has bad e_type %d\n", interp_elf_ex->e_type); return 0xffffffff; } /* Now read in all of the header information */ if(sizeof(struct elf_phdr) * interp_elf_ex->e_phnum > PAGE_SIZE) { - printk("IRIX interp header bigger than a page (%d)\n", + printk(KERN_ERR "IRIX interp header bigger than a page (%d)\n", (sizeof(struct elf_phdr) * interp_elf_ex->e_phnum)); return 0xffffffff; } @@ -271,7 +271,7 @@ GFP_KERNEL); if(!elf_phdata) { - printk("Cannot kmalloc phdata for IRIX interp.\n"); + printk(KERN_ERR "Cannot kmalloc phdata for IRIX interp.\n"); return 0xffffffff; } @@ -279,7 +279,7 @@ * we will be doing the wrong thing. */ if(interp_elf_ex->e_phentsize != 32) { - printk("IRIX interp e_phentsize == %d != 32 ", + printk(KERN_ERR "IRIX interp e_phentsize == %d != 32 ", interp_elf_ex->e_phentsize); kfree(elf_phdata); return 0xffffffff; @@ -306,7 +306,7 @@ vaddr = eppnt->p_vaddr; #ifdef DEBUG_ELF - printk("INTERP do_mmap(%p, %08lx, %08lx, %08lx, %08lx, %08lx) ", + printk(KERN_DEBUG "INTERP do_mmap(%p, %08lx, %08lx, %08lx, %08lx, %08lx) ", interpreter, vaddr, (unsigned long) (eppnt->p_filesz + (eppnt->p_vaddr & 0xfff)), (unsigned long) elf_prot, (unsigned long) elf_type, @@ -320,16 +320,16 @@ up_write(¤t->mm->mmap_sem); if(error < 0 && error > -1024) { - printk("Aieee IRIX interp mmap error=%d\n", error); + printk(KERN_ERR "Aieee IRIX interp mmap error=%d\n", error); break; /* Real error */ } #ifdef DEBUG_ELF - printk("error=%08lx ", (unsigned long) error); + printk(KERN_DEBUG "error=%08lx ", (unsigned long) error); #endif if(!load_addr && interp_elf_ex->e_type == ET_DYN) { load_addr = error; #ifdef DEBUG_ELF - printk("load_addr = error "); + printk(KERN_DEBUG "load_addr = error "); #endif } @@ -345,7 +345,7 @@ k = eppnt->p_memsz + eppnt->p_vaddr; if(k > last_bss) last_bss = k; #ifdef DEBUG_ELF - printk("\n"); + printk(KERN_DEBUG "\n"); #endif } } @@ -353,7 +353,7 @@ /* Now use mmap to map the library into memory. */ if(error < 0 && error > -1024) { #ifdef DEBUG_ELF - printk("got error %d\n", error); + printk(KERN_DEBUG "got error %d\n", error); #endif kfree(elf_phdata); return 0xffffffff; @@ -365,13 +365,13 @@ * last bss page. */ #ifdef DEBUG_ELF - printk("padzero(%08lx) ", (unsigned long) (elf_bss)); + printk(KERN_DEBUG "padzero(%08lx) ", (unsigned long) (elf_bss)); #endif padzero(elf_bss); len = (elf_bss + 0xfff) & 0xfffff000; /* What we have mapped so far */ #ifdef DEBUG_ELF - printk("last_bss[%08lx] len[%08lx]\n", (unsigned long) last_bss, + printk(KERN_DEBUG "last_bss[%08lx] len[%08lx]\n", (unsigned long) last_bss, (unsigned long) len); #endif @@ -640,7 +640,7 @@ }; } #ifdef DEBUG_ELF - printk("\n"); + printk(KERN_DEBUG "\n"); #endif elf_bss = 0; @@ -708,7 +708,7 @@ kfree(elf_interpreter); if(retval) { set_fs(old_fs); - printk("Unable to load IRIX ELF interpreter\n"); + printk(KERN_ERR "Unable to load IRIX ELF interpreter\n"); send_sig(SIGSEGV, current, 0); retval = 0; goto out_free_file; @@ -746,12 +746,12 @@ padzero(elf_bss); #ifdef DEBUG_ELF - printk("(start_brk) %lx\n" , (long) current->mm->start_brk); - printk("(end_code) %lx\n" , (long) current->mm->end_code); - printk("(start_code) %lx\n" , (long) current->mm->start_code); - printk("(end_data) %lx\n" , (long) current->mm->end_data); - printk("(start_stack) %lx\n" , (long) current->mm->start_stack); - printk("(brk) %lx\n" , (long) current->mm->brk); + printk(KERN_DEBUG "(start_brk) %lx\n" , (long) current->mm->start_brk); + printk(KERN_DEBUG "(end_code) %lx\n" , (long) current->mm->end_code); + printk(KERN_DEBUG "(start_code) %lx\n" , (long) current->mm->start_code); + printk(KERN_DEBUG "(end_data) %lx\n" , (long) current->mm->end_data); + printk(KERN_DEBUG "(start_stack) %lx\n" , (long) current->mm->start_stack); + printk(KERN_DEBUG "(brk) %lx\n" , (long) current->mm->brk); #endif #if 0 /* XXX No fucking way dude... */ @@ -874,7 +874,7 @@ int i, retval; #ifdef DEBUG_ELF - printk("irix_mapelf: fd[%d] user_phdrp[%p] cnt[%d]\n", + printk(KERN_DEBUG "irix_mapelf: fd[%d] user_phdrp[%p] cnt[%d]\n", fd, user_phdrp, cnt); #endif @@ -883,7 +883,7 @@ retval = verify_area(VERIFY_READ, hp, (sizeof(struct elf_phdr) * cnt)); if(retval) { #ifdef DEBUG_ELF - printk("irix_mapelf: verify_area fails!\n"); + printk(KERN_DEBUG "irix_mapelf: verify_area fails!\n"); #endif return retval; } @@ -894,7 +894,7 @@ for(i = 0; i < cnt; i++, hp++) if(hp->p_type != PT_LOAD) { - printk("irix_mapelf: One section is not PT_LOAD!\n"); + printk(KERN_ERR "irix_mapelf: One section is not PT_LOAD!\n"); return -ENOEXEC; } @@ -902,7 +902,7 @@ if (!filp) return -EACCES; if(!filp->f_op) { - printk("irix_mapelf: Bogon filp!\n"); + printk(KERN_ERR "irix_mapelf: Bogon filp!\n"); fput(filp); return -EACCES; } @@ -922,14 +922,14 @@ up_write(¤t->mm->mmap_sem); if(retval != (hp->p_vaddr & 0xfffff000)) { - printk("irix_mapelf: do_mmap fails with %d!\n", retval); + printk(KERN_ERR "irix_mapelf: do_mmap fails with %d!\n", retval); fput(filp); return retval; } } #ifdef DEBUG_ELF - printk("irix_mapelf: Success, returning %08lx\n", user_phdrp->p_vaddr); + printk(KERN_DEBUG "irix_mapelf: Success, returning %08lx\n", user_phdrp->p_vaddr); #endif fput(filp); return user_phdrp->p_vaddr; @@ -1080,7 +1080,7 @@ segs++; } #ifdef DEBUG - printk("irix_core_dump: %d segs taking %d bytes\n", segs, size); + printk(KERN_DEBUG "irix_core_dump: %d segs taking %d bytes\n", segs, size); #endif /* Set up header. */ @@ -1140,7 +1140,7 @@ prstatus.pr_cstime.tv_sec = CT_TO_SECS(current->cstime); prstatus.pr_cstime.tv_usec = CT_TO_USECS(current->cstime); if (sizeof(elf_gregset_t) != sizeof(struct pt_regs)) { - printk("sizeof(elf_gregset_t) (%d) != sizeof(struct pt_regs) " + printk(KERN_EMERG "sizeof(elf_gregset_t) (%d) != sizeof(struct pt_regs) " "(%d)\n", sizeof(elf_gregset_t), sizeof(struct pt_regs)); } else { *(struct pt_regs *)&prstatus.pr_reg = *regs; @@ -1259,14 +1259,14 @@ continue; i++; #ifdef DEBUG - printk("elf_core_dump: writing %08lx %lx\n", addr, len); + printk(KERN_DEBUG "elf_core_dump: writing %08lx %lx\n", addr, len); #endif DUMP_WRITE((void *)addr, len); } if ((off_t) file->f_pos != offset) { /* Sanity check. */ - printk("elf_core_dump: file->f_pos (%ld) != offset (%ld)\n", + printk(KERN_DEBUG "elf_core_dump: file->f_pos (%ld) != offset (%ld)\n", (off_t) file->f_pos, offset); } diff -urN linux-2.6.0-test1/arch/mips/kernel/irixioctl.c linux-2.6.0-test1-printk-mips/arch/mips/kernel/irixioctl.c --- linux-2.6.0-test1/arch/mips/kernel/irixioctl.c 2003-07-13 23:36:31.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/kernel/irixioctl.c 2003-07-17 17:34:15.000000000 -0400 @@ -63,12 +63,12 @@ int error = 0; #ifdef DEBUG_IOCTLS - printk("[%s:%d] irix_ioctl(%d, ", current->comm, current->pid, fd); + printk(KERN_DEBUG "[%s:%d] irix_ioctl(%d, ", current->comm, current->pid, fd); #endif switch(cmd) { case 0x00005401: #ifdef DEBUG_IOCTLS - printk("TCGETA, %08lx) ", arg); + printk(KERN_DEBUG "TCGETA, %08lx) ", arg); #endif error = sys_ioctl(fd, TCGETA, arg); break; @@ -78,7 +78,7 @@ struct irix_termios *it = (struct irix_termios *) arg; #ifdef DEBUG_IOCTLS - printk("TCGETS, %08lx) ", arg); + printk(KERN_DEBUG "TCGETS, %08lx) ", arg); #endif if(!access_ok(VERIFY_WRITE, it, sizeof(*it))) { error = -EFAULT; @@ -104,7 +104,7 @@ struct irix_termios *it = (struct irix_termios *) arg; #ifdef DEBUG_IOCTLS - printk("TCSETS, %08lx) ", arg); + printk(KERN_DEBUG "TCSETS, %08lx) ", arg); #endif if (!access_ok(VERIFY_READ, it, sizeof(*it))) { error = -EFAULT; @@ -129,21 +129,21 @@ case 0x0000540f: #ifdef DEBUG_IOCTLS - printk("TCSETSW, %08lx) ", arg); + printk(KERN_DEBUG "TCSETSW, %08lx) ", arg); #endif error = sys_ioctl(fd, TCSETSW, arg); break; case 0x00005471: #ifdef DEBUG_IOCTLS - printk("TIOCNOTTY, %08lx) ", arg); + printk(KERN_DEBUG "TIOCNOTTY, %08lx) ", arg); #endif error = sys_ioctl(fd, TIOCNOTTY, arg); break; case 0x00007416: #ifdef DEBUG_IOCTLS - printk("TIOCGSID, %08lx) ", arg); + printk(KERN_DEBUG "TIOCGSID, %08lx) ", arg); #endif tp = get_tty(fd); if(!tp) { @@ -152,7 +152,7 @@ } rtp = get_real_tty(tp); #ifdef DEBUG_IOCTLS - printk("rtp->session=%d ", rtp->session); + printk(KERN_DEBUG "rtp->session=%d ", rtp->session); #endif error = put_user(rtp->session, (unsigned long *) arg); break; @@ -160,7 +160,7 @@ case 0x746e: /* TIOCSTART, same effect as hitting ^Q */ #ifdef DEBUG_IOCTLS - printk("TIOCSTART, %08lx) ", arg); + printk(KERN_DEBUG "TIOCSTART, %08lx) ", arg); #endif tp = get_tty(fd); if(!tp) { @@ -173,66 +173,66 @@ case 0x20006968: #ifdef DEBUG_IOCTLS - printk("SIOCGETLABEL, %08lx) ", arg); + printk(KERN_DEBUG "SIOCGETLABEL, %08lx) ", arg); #endif error = -ENOPKG; break; case 0x40047477: #ifdef DEBUG_IOCTLS - printk("TIOCGPGRP, %08lx) ", arg); + printk(KERN_DEBUG "TIOCGPGRP, %08lx) ", arg); #endif error = sys_ioctl(fd, TIOCGPGRP, arg); #ifdef DEBUG_IOCTLS - printk("arg=%d ", *(int *)arg); + printk(KERN_DEBUG "arg=%d ", *(int *)arg); #endif break; case 0x40087468: #ifdef DEBUG_IOCTLS - printk("TIOCGWINSZ, %08lx) ", arg); + printk(KERN_DEBUG "TIOCGWINSZ, %08lx) ", arg); #endif error = sys_ioctl(fd, TIOCGWINSZ, arg); break; case 0x8004667e: #ifdef DEBUG_IOCTLS - printk("FIONBIO, %08lx) arg=%d ", arg, *(int *)arg); + printk(KERN_DEBUG "FIONBIO, %08lx) arg=%d ", arg, *(int *)arg); #endif error = sys_ioctl(fd, FIONBIO, arg); break; case 0x80047476: #ifdef DEBUG_IOCTLS - printk("TIOCSPGRP, %08lx) arg=%d ", arg, *(int *)arg); + printk(KERN_DEBUG "TIOCSPGRP, %08lx) arg=%d ", arg, *(int *)arg); #endif error = sys_ioctl(fd, TIOCSPGRP, arg); break; case 0x8020690c: #ifdef DEBUG_IOCTLS - printk("SIOCSIFADDR, %08lx) arg=%d ", arg, *(int *)arg); + printk(KERN_DEBUG "SIOCSIFADDR, %08lx) arg=%d ", arg, *(int *)arg); #endif error = sys_ioctl(fd, SIOCSIFADDR, arg); break; case 0x80206910: #ifdef DEBUG_IOCTLS - printk("SIOCSIFFLAGS, %08lx) arg=%d ", arg, *(int *)arg); + printk(KERN_DEBUG "SIOCSIFFLAGS, %08lx) arg=%d ", arg, *(int *)arg); #endif error = sys_ioctl(fd, SIOCSIFFLAGS, arg); break; case 0xc0206911: #ifdef DEBUG_IOCTLS - printk("SIOCGIFFLAGS, %08lx) arg=%d ", arg, *(int *)arg); + printk(KERN_DEBUG "SIOCGIFFLAGS, %08lx) arg=%d ", arg, *(int *)arg); #endif error = sys_ioctl(fd, SIOCGIFFLAGS, arg); break; case 0xc020691b: #ifdef DEBUG_IOCTLS - printk("SIOCGIFMETRIC, %08lx) arg=%d ", arg, *(int *)arg); + printk(KERN_DEBUG "SIOCGIFMETRIC, %08lx) arg=%d ", arg, *(int *)arg); #endif error = sys_ioctl(fd, SIOCGIFMETRIC, arg); break; @@ -242,12 +242,12 @@ char *msg = "Unimplemented IOCTL cmd tell linux@engr.sgi.com\n"; #ifdef DEBUG_IOCTLS - printk("UNIMP_IOCTL, %08lx)\n", arg); + printk(KERN_DEBUG "UNIMP_IOCTL, %08lx)\n", arg); #endif old_fs = get_fs(); set_fs(get_ds()); sys_write(2, msg, strlen(msg)); set_fs(old_fs); - printk("[%s:%d] Does unimplemented IRIX ioctl cmd %08lx\n", + printk(KERN_NOTICE "[%s:%d] Does unimplemented IRIX ioctl cmd %08lx\n", current->comm, current->pid, cmd); do_exit(255); #else @@ -257,7 +257,7 @@ }; #ifdef DEBUG_IOCTLS - printk("error=%d\n", error); + printk(KERN_DEBUG "error=%d\n", error); #endif return error; } diff -urN linux-2.6.0-test1/arch/mips/kernel/irixsig.c linux-2.6.0-test1-printk-mips/arch/mips/kernel/irixsig.c --- linux-2.6.0-test1/arch/mips/kernel/irixsig.c 2003-07-13 23:37:26.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/kernel/irixsig.c 2003-07-17 17:36:00.000000000 -0400 @@ -48,29 +48,29 @@ { int i; - printk("misc: rmask[%08lx] status[%08lx] pc[%08lx]\n", + printk(KERN_DEBUG "misc: rmask[%08lx] status[%08lx] pc[%08lx]\n", (unsigned long) c->rmask, (unsigned long) c->cp0_status, (unsigned long) c->pc); - printk("regs: "); + printk(KERN_DEBUG "regs: "); for(i = 0; i < 16; i++) - printk("[%d]<%08lx> ", i, (unsigned long) c->regs[i]); - printk("\nregs: "); + printk(KERN_DEBUG "[%d]<%08lx> ", i, (unsigned long) c->regs[i]); + printk(KERN_DEBUG "\nregs: "); for(i = 16; i < 32; i++) - printk("[%d]<%08lx> ", i, (unsigned long) c->regs[i]); - printk("\nfpregs: "); + printk(KERN_DEBUG "[%d]<%08lx> ", i, (unsigned long) c->regs[i]); + printk(KERN_DEBUG "\nfpregs: "); for(i = 0; i < 16; i++) - printk("[%d]<%08lx> ", i, (unsigned long) c->fpregs[i]); - printk("\nfpregs: "); + printk(KERN_DEBUG "[%d]<%08lx> ", i, (unsigned long) c->fpregs[i]); + printk(KERN_DEBUG "\nfpregs: "); for(i = 16; i < 32; i++) - printk("[%d]<%08lx> ", i, (unsigned long) c->fpregs[i]); - printk("misc: usedfp[%d] fpcsr[%08lx] fpeir[%08lx] stk_flgs[%08lx]\n", + printk(KERN_DEBUG "[%d]<%08lx> ", i, (unsigned long) c->fpregs[i]); + printk(KERN_DEBUG "misc: usedfp[%d] fpcsr[%08lx] fpeir[%08lx] stk_flgs[%08lx]\n", (int) c->usedfp, (unsigned long) c->fpcsr, (unsigned long) c->fpeir, (unsigned long) c->sstk_flags); - printk("misc: hi[%08lx] lo[%08lx] cause[%08lx] badvaddr[%08lx]\n", + printk(KERN_DEBUG "misc: hi[%08lx] lo[%08lx] cause[%08lx] badvaddr[%08lx]\n", (unsigned long) c->hi, (unsigned long) c->lo, (unsigned long) c->cp0_cause, (unsigned long) c->cp0_badvaddr); - printk("misc: sigset<0>[%08lx] sigset<1>[%08lx] sigset<2>[%08lx] " + printk(KERN_DEBUG "misc: sigset<0>[%08lx] sigset<1>[%08lx] sigset<2>[%08lx] " "sigset<3>[%08lx]\n", (unsigned long) c->sigset.sig[0], (unsigned long) c->sigset.sig[1], (unsigned long) c->sigset.sig[2], @@ -131,7 +131,7 @@ setup_irix_rt_frame(struct k_sigaction * ka, struct pt_regs *regs, int signr, sigset_t *oldmask, siginfo_t *info) { - printk("Aiee: setup_tr_frame wants to be written"); + printk(KERN_ERR "Aiee: setup_tr_frame wants to be written"); do_exit(SIGSEGV); } @@ -217,7 +217,7 @@ magic = (struct sigctx_irix5 *) regs->regs[base + 5]; sig = (int) regs->regs[base + 6]; #ifdef DEBUG_SIG - printk("[%s:%d] IRIX sigreturn(scp[%p],ucp[%p],sig[%d])\n", + printk(KERN_DEBUG "[%s:%d] IRIX sigreturn(scp[%p],ucp[%p],sig[%d])\n", current->comm, current->pid, context, magic, sig); #endif if (!context) @@ -282,7 +282,7 @@ #ifdef DEBUG_SIG static inline void dump_sigact_irix5(struct sigact_irix5 *p) { - printk("", p->flags, + printk(KERN_DEBUG "", p->flags, (unsigned long) p->handler, (unsigned long) p->sigset[0]); } @@ -296,10 +296,10 @@ int ret; #ifdef DEBUG_SIG - printk(" (%d,%s,%s,%08lx) ", sig, (!new ? "0" : "NEW"), + printk(KERN_DEBUG " (%d,%s,%s,%08lx) ", sig, (!new ? "0" : "NEW"), (!old ? "0" : "OLD"), trampoline); if(new) { - dump_sigact_irix5(new); printk(" "); + dump_sigact_irix5(new); printk(KERN_DEBUG " "); } #endif if (act) { @@ -456,7 +456,7 @@ int i, sig, error, timeo = 0; #ifdef DEBUG_SIG - printk("[%s:%d] irix_sigpoll_sys(%p,%p,%p)\n", + printk(KERN_DEBUG "[%s:%d] irix_sigpoll_sys(%p,%p,%p)\n", current->comm, current->pid, set, info, tp); #endif @@ -691,7 +691,7 @@ ctx = (struct irix5_context *) regs->regs[base + 4]; #ifdef DEBUG_SIG - printk("[%s:%d] irix_getcontext(%p)\n", + printk(KERN_DEBUG "[%s:%d] irix_getcontext(%p)\n", current->comm, current->pid, ctx); #endif @@ -721,7 +721,7 @@ flags &= ~(0x08); } else { /* XXX wheee... */ - printk("Wheee, no code for saving IRIX FPU context yet.\n"); + printk(KERN_WARNING "Wheee, no code for saving IRIX FPU context yet.\n"); } __put_user(flags, &ctx->flags); error = 0; @@ -740,7 +740,7 @@ ctx = (struct irix5_context *) regs->regs[base + 4]; #ifdef DEBUG_SIG - printk("[%s:%d] irix_setcontext(%p)\n", + printk(KERN_DEBUG "[%s:%d] irix_setcontext(%p)\n", current->comm, current->pid, ctx); #endif @@ -750,7 +750,7 @@ if (ctx->flags & 0x02) { /* XXX sigstack garbage, todo... */ - printk("Wheee, cannot do sigstack stuff in setcontext\n"); + printk(KERN_WARNING "Wheee, cannot do sigstack stuff in setcontext\n"); } if (ctx->flags & 0x04) { @@ -766,7 +766,7 @@ if (ctx->flags & 0x08) { /* XXX fpu context, blah... */ - printk("Wheee, cannot restore FPU context yet...\n"); + printk(KERN_WARNING "Wheee, cannot restore FPU context yet...\n"); } current->thread.irix_oldctx = ctx->link; error = regs->regs[2]; @@ -782,7 +782,7 @@ int error; #ifdef DEBUG_SIG - printk("[%s:%d] irix_sigstack(%p,%p)\n", + printk(KERN_DEBUG "[%s:%d] irix_sigstack(%p,%p)\n", current->comm, current->pid, new, old); #endif if(new) { @@ -810,7 +810,7 @@ int error; #ifdef DEBUG_SIG - printk("[%s:%d] irix_sigaltstack(%p,%p)\n", + printk(KERN_DEBUG "[%s:%d] irix_sigaltstack(%p,%p)\n", current->comm, current->pid, new, old); #endif if (new) { @@ -844,7 +844,7 @@ if(error) goto out; #ifdef DEBUG_SIG - printk("[%s:%d] irix_sigsendset([%d,%d,%d,%d,%d],%d)\n", + printk(KERN_DEBUG "[%s:%d] irix_sigsendset([%d,%d,%d,%d,%d],%d)\n", current->comm, current->pid, pset->cmd, pset->ltype, pset->lid, pset->rtype, pset->rid, sig); diff -urN linux-2.6.0-test1/arch/mips/kernel/irq.c linux-2.6.0-test1-printk-mips/arch/mips/kernel/irq.c --- linux-2.6.0-test1/arch/mips/kernel/irq.c 2003-07-13 23:30:43.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/kernel/irq.c 2003-07-17 16:50:39.000000000 -0400 @@ -60,7 +60,7 @@ * each architecture has to answer this themselves, it doesn't deserve * a generic callback i think. */ - printk("unexpected interrupt %d\n", irq); + printk(KERN_WARNING "unexpected interrupt %d\n", irq); } /* startup is the same as "enable", shutdown is same as "disable" */ @@ -176,7 +176,7 @@ printk(KERN_ERR "[<%p>]", action->handler); print_symbol(" (%s)", (unsigned long)action->handler); - printk("\n"); + printk(KERN_ERR "\n"); action = action->next; } while (action); } @@ -196,7 +196,7 @@ static int __init noirqdebug_setup(char *str) { noirqdebug = 1; - printk("IRQ lockup detection disabled\n"); + printk(KERN_INFO "IRQ lockup detection disabled\n"); return 1; } @@ -321,7 +321,7 @@ desc->depth--; break; case 0: - printk("enable_irq(%u) unbalanced from %p\n", irq, + printk(KERN_WARNING "enable_irq(%u) unbalanced from %p\n", irq, __builtin_return_address(0)); } spin_unlock_irqrestore(&desc->lock, flags); @@ -468,7 +468,7 @@ */ if (irqflags & SA_SHIRQ) { if (!dev_id) - printk("Bad boy: %s (at 0x%x) called us without a dev_id!\n", devname, (&irq)[-1]); + printk(KERN_ERR "Bad boy: %s (at 0x%x) called us without a dev_id!\n", devname, (&irq)[-1]); } #endif @@ -543,7 +543,7 @@ kfree(action); return; } - printk("Trying to free free IRQ%d\n",irq); + printk(KERN_NOTICE "Trying to free free IRQ%d\n",irq); spin_unlock_irqrestore(&desc->lock,flags); return; } diff -urN linux-2.6.0-test1/arch/mips/kernel/process.c linux-2.6.0-test1-printk-mips/arch/mips/kernel/process.c --- linux-2.6.0-test1/arch/mips/kernel/process.c 2003-07-13 23:33:13.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/kernel/process.c 2003-07-17 16:54:55.000000000 -0400 @@ -217,7 +217,7 @@ } } if (info->pc_offset == -1 || info->frame_offset == -1) { - printk("Can't analyze prologue code at %p\n", func); + printk(KERN_ERR "Can't analyze prologue code at %p\n", func); info->pc_offset = -1; info->frame_offset = -1; return -1; diff -urN linux-2.6.0-test1/arch/mips/kernel/ptrace.c linux-2.6.0-test1-printk-mips/arch/mips/kernel/ptrace.c --- linux-2.6.0-test1/arch/mips/kernel/ptrace.c 2003-07-13 23:39:29.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/kernel/ptrace.c 2003-07-17 17:54:55.000000000 -0400 @@ -47,7 +47,7 @@ int ret; #if 0 - printk("ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n", + printk(KERN_DEBUG "ptrace(r=%d,pid=%d,addr=%08lx,data=%08lx)\n", (int) request, (int) pid, (unsigned long) addr, (unsigned long) data); #endif diff -urN linux-2.6.0-test1/arch/mips/kernel/setup.c linux-2.6.0-test1-printk-mips/arch/mips/kernel/setup.c --- linux-2.6.0-test1/arch/mips/kernel/setup.c 2003-07-13 23:31:21.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/kernel/setup.c 2003-07-17 16:53:39.000000000 -0400 @@ -140,7 +140,7 @@ int x = boot_mem_map.nr_map; if (x == BOOT_MEM_MAP_MAX) { - printk("Ooops! Too many entries in the memory map!\n"); + printk(KERN_ERR "Ooops! Too many entries in the memory map!\n"); return; } @@ -155,22 +155,22 @@ int i; for (i = 0; i < boot_mem_map.nr_map; i++) { - printk(" memory: %08Lx @ %08Lx ", + printk(KERN_INFO " memory: %08Lx @ %08Lx ", (u64) boot_mem_map.map[i].size, (u64) boot_mem_map.map[i].addr); switch (boot_mem_map.map[i].type) { case BOOT_MEM_RAM: - printk("(usable)\n"); + printk(KERN_INFO "(usable)\n"); break; case BOOT_MEM_ROM_DATA: - printk("(ROM data)\n"); + printk(KERN_INFO "(ROM data)\n"); break; case BOOT_MEM_RESERVED: - printk("(reserved)\n"); + printk(KERN_INFO "(reserved)\n"); break; default: - printk("type %lu\n", boot_mem_map.map[i].type); + printk(KERN_INFO "type %lu\n", boot_mem_map.map[i].type); break; } } @@ -183,7 +183,7 @@ int len = 0; int usermem = 0; - printk("Determined physical RAM map:\n"); + printk(KERN_NOTICE "Determined physical RAM map:\n"); print_memory_map(); for (;;) { @@ -222,7 +222,7 @@ *to = '\0'; if (usermem) { - printk("User-defined physical RAM map:\n"); + printk(KERN_NOTICE "User-defined physical RAM map:\n"); print_memory_map(); } } @@ -384,11 +384,11 @@ initrd_below_start_ok = 1; if (initrd_start) { unsigned long initrd_size = ((unsigned char *)initrd_end) - ((unsigned char *)initrd_start); - printk("Initial ramdisk at: 0x%p (%lu bytes)\n", + printk(KERN_NOTICE "Initial ramdisk at: 0x%p (%lu bytes)\n", (void *)initrd_start, initrd_size); if (PHYSADDR(initrd_end) > PFN_PHYS(max_low_pfn)) { - printk("initrd extends beyond end of memory " + printk(KERN_NOTICE "initrd extends beyond end of memory " "(0x%08lx > 0x%08lx)\ndisabling initrd\n", PHYSADDR(initrd_end), PFN_PHYS(max_low_pfn)); diff -urN linux-2.6.0-test1/arch/mips/kernel/signal.c linux-2.6.0-test1-printk-mips/arch/mips/kernel/signal.c --- linux-2.6.0-test1/arch/mips/kernel/signal.c 2003-07-13 23:36:45.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/kernel/signal.c 2003-07-17 17:34:34.000000000 -0400 @@ -396,7 +396,7 @@ regs->cp0_epc = regs->regs[25] = (unsigned long) ka->sa.sa_handler; #if DEBUG_SIG - printk("SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%p\n", + printk(KERN_DEBUG "SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%p\n", current->comm, current->pid, frame, regs->cp0_epc, frame->sf_code); #endif @@ -464,7 +464,7 @@ regs->cp0_epc = regs->regs[25] = (unsigned long) ka->sa.sa_handler; #if DEBUG_SIG - printk("SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%p\n", + printk(KERN_DEBUG "SIG deliver (%s:%d): sp=0x%p pc=0x%lx ra=0x%p\n", current->comm, current->pid, frame, regs->cp0_epc, frame->rs_code); #endif diff -urN linux-2.6.0-test1/arch/mips/kernel/smp.c linux-2.6.0-test1-printk-mips/arch/mips/kernel/smp.c --- linux-2.6.0-test1/arch/mips/kernel/smp.c 2003-07-13 23:31:20.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/kernel/smp.c 2003-07-17 16:51:32.000000000 -0400 @@ -110,10 +110,10 @@ cacheflush_time = (cpu_khz>>10) * (cachesize<<10) / bandwidth; cache_decay_ticks = (long)cacheflush_time/cpu_khz * HZ / 1000; - printk("per-CPU timeslice cutoff: %ld.%02ld usecs.\n", + printk(KERN_NOTICE "per-CPU timeslice cutoff: %ld.%02ld usecs.\n", (long)cacheflush_time/(cpu_khz/1000), ((long)cacheflush_time*100/(cpu_khz/1000)) % 100); - printk("task migration cache decay timeout: %ld msecs.\n", + printk(KERN_NOTICE "task migration cache decay timeout: %ld msecs.\n", (cache_decay_ticks + 1) * 1000 / HZ); } @@ -145,7 +145,7 @@ pgd_current[cpu] = init_mm.pgd; cpu_data[cpu].udelay_val = loops_per_jiffy; prom_smp_finish(); - printk("Slave cpu booted successfully\n"); + printk(KERN_NOTICE "Slave cpu booted successfully\n"); CPUMASK_SETB(cpu_online_map, cpu); atomic_inc(&cpus_booted); cpu_idle(); diff -urN linux-2.6.0-test1/arch/mips/kernel/sysirix.c linux-2.6.0-test1-printk-mips/arch/mips/kernel/sysirix.c --- linux-2.6.0-test1/arch/mips/kernel/sysirix.c 2003-07-13 23:38:01.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/kernel/sysirix.c 2003-07-17 17:52:37.000000000 -0400 @@ -63,7 +63,7 @@ error = num_online_cpus(); break; default: - printk("SYSMP[%s:%d]: Unsupported opcode %d\n", + printk(KERN_ERR "SYSMP[%s:%d]: Unsupported opcode %d\n", current->comm, current->pid, (int)cmd); error = -EINVAL; break; @@ -100,7 +100,7 @@ cmd = regs->regs[base + 4]; switch (cmd) { case PR_MAXPROCS: - printk("irix_prctl[%s:%d]: Wants PR_MAXPROCS\n", + printk(KERN_WARNING "irix_prctl[%s:%d]: Wants PR_MAXPROCS\n", current->comm, current->pid); error = max_threads; break; @@ -108,7 +108,7 @@ case PR_ISBLOCKED: { struct task_struct *task; - printk("irix_prctl[%s:%d]: Wants PR_ISBLOCKED\n", + printk(KERN_WARNING "irix_prctl[%s:%d]: Wants PR_ISBLOCKED\n", current->comm, current->pid); read_lock(&tasklist_lock); task = find_task_by_pid(regs->regs[base + 5]); @@ -123,7 +123,7 @@ case PR_SETSTACKSIZE: { long value = regs->regs[base + 5]; - printk("irix_prctl[%s:%d]: Wants PR_SETSTACKSIZE<%08lx>\n", + printk(KERN_WARNING "irix_prctl[%s:%d]: Wants PR_SETSTACKSIZE<%08lx>\n", current->comm, current->pid, (unsigned long) value); if (value > RLIM_INFINITY) value = RLIM_INFINITY; @@ -143,25 +143,25 @@ } case PR_GETSTACKSIZE: - printk("irix_prctl[%s:%d]: Wants PR_GETSTACKSIZE\n", + printk(KERN_WARNING "irix_prctl[%s:%d]: Wants PR_GETSTACKSIZE\n", current->comm, current->pid); error = current->rlim[RLIMIT_STACK].rlim_cur; break; case PR_MAXPPROCS: - printk("irix_prctl[%s:%d]: Wants PR_MAXPROCS\n", + printk(KERN_WARNING "irix_prctl[%s:%d]: Wants PR_MAXPROCS\n", current->comm, current->pid); error = 1; break; case PR_UNBLKONEXEC: - printk("irix_prctl[%s:%d]: Wants PR_UNBLKONEXEC\n", + printk(KERN_WARNING "irix_prctl[%s:%d]: Wants PR_UNBLKONEXEC\n", current->comm, current->pid); error = -EINVAL; break; case PR_SETEXITSIG: - printk("irix_prctl[%s:%d]: Wants PR_SETEXITSIG\n", + printk(KERN_WARNING "irix_prctl[%s:%d]: Wants PR_SETEXITSIG\n", current->comm, current->pid); /* We can probably play some game where we set the task @@ -172,31 +172,31 @@ break; case PR_RESIDENT: - printk("irix_prctl[%s:%d]: Wants PR_RESIDENT\n", + printk(KERN_WARNING "irix_prctl[%s:%d]: Wants PR_RESIDENT\n", current->comm, current->pid); error = 0; /* Compatibility indeed. */ break; case PR_ATTACHADDR: - printk("irix_prctl[%s:%d]: Wants PR_ATTACHADDR\n", + printk(KERN_WARNING "irix_prctl[%s:%d]: Wants PR_ATTACHADDR\n", current->comm, current->pid); error = -EINVAL; break; case PR_DETACHADDR: - printk("irix_prctl[%s:%d]: Wants PR_DETACHADDR\n", + printk(KERN_WARNING "irix_prctl[%s:%d]: Wants PR_DETACHADDR\n", current->comm, current->pid); error = -EINVAL; break; case PR_TERMCHILD: - printk("irix_prctl[%s:%d]: Wants PR_TERMCHILD\n", + printk(KERN_WARNING "irix_prctl[%s:%d]: Wants PR_TERMCHILD\n", current->comm, current->pid); error = -EINVAL; break; case PR_GETSHMASK: - printk("irix_prctl[%s:%d]: Wants PR_GETSHMASK\n", + printk(KERN_WARNING "irix_prctl[%s:%d]: Wants PR_GETSHMASK\n", current->comm, current->pid); error = -EINVAL; /* Until I have the sproc() stuff in. */ break; @@ -206,24 +206,24 @@ break; case PR_COREPID: - printk("irix_prctl[%s:%d]: Wants PR_COREPID\n", + printk(KERN_WARNING "irix_prctl[%s:%d]: Wants PR_COREPID\n", current->comm, current->pid); error = -EINVAL; break; case PR_ATTACHADDRPERM: - printk("irix_prctl[%s:%d]: Wants PR_ATTACHADDRPERM\n", + printk(KERN_WARNING "irix_prctl[%s:%d]: Wants PR_ATTACHADDRPERM\n", current->comm, current->pid); error = -EINVAL; break; case PR_PTHREADEXIT: - printk("irix_prctl[%s:%d]: Wants PR_PTHREADEXIT\n", + printk(KERN_WARNING "irix_prctl[%s:%d]: Wants PR_PTHREADEXIT\n", current->comm, current->pid); do_exit(regs->regs[base + 5]); default: - printk("irix_prctl[%s:%d]: Non-existant opcode %d\n", + printk(KERN_WARNING "irix_prctl[%s:%d]: Non-existant opcode %d\n", current->comm, current->pid, (int)cmd); error = -EINVAL; break; @@ -335,7 +335,7 @@ return -EINVAL; /* til I fix it */ retval = prom_setenv(name, value); /* XXX make sure retval conforms to syssgi(2) */ - printk("[%s:%d] setnvram(\"%s\", \"%s\"): retval %d", + printk(KERN_NOTICE "[%s:%d] setnvram(\"%s\", \"%s\"): retval %d", current->comm, current->pid, name, value, retval); /* if (retval == PROM_ENOENT) retval = -ENOENT; */ @@ -345,14 +345,14 @@ case SGI_SETPGID: { #ifdef DEBUG_PROCGRPS - printk("[%s:%d] setpgid(%d, %d) ", + printk(KERN_DEBUG "[%s:%d] setpgid(%d, %d) ", current->comm, current->pid, (int) regs->regs[base + 5], (int)regs->regs[base + 6]); #endif retval = sys_setpgid(regs->regs[base + 5], regs->regs[base + 6]); #ifdef DEBUG_PROCGRPS - printk("retval=%d\n", retval); + printk(KERN_DEBUG "retval=%d\n", retval); #endif } @@ -442,12 +442,12 @@ case SGI_GETSID: #ifdef DEBUG_PROCGRPS - printk("[%s:%d] getsid(%d) ", current->comm, current->pid, + printk(KERN_DEBUG "[%s:%d] getsid(%d) ", current->comm, current->pid, (int) regs->regs[base + 5]); #endif retval = sys_getsid(regs->regs[base + 5]); #ifdef DEBUG_PROCGRPS - printk("retval=%d\n", retval); + printk(KERN_DEBUG "retval=%d\n", retval); #endif break; @@ -514,7 +514,7 @@ } default: - printk("irix_syssgi: Unsupported command %d\n", (int)cmd); + printk(KERN_ERR "irix_syssgi: Unsupported command %d\n", (int)cmd); retval = -EINVAL; break; }; @@ -704,7 +704,7 @@ asmlinkage int irix_mount(char *dev_name, char *dir_name, unsigned long flags, char *type, void *data, int datalen) { - printk("[%s:%d] irix_mount(%p,%p,%08lx,%p,%p,%d)\n", + printk(KERN_NOTICE "[%s:%d] irix_mount(%p,%p,%08lx,%p,%p,%d)\n", current->comm, current->pid, dev_name, dir_name, flags, type, data, datalen); @@ -803,14 +803,14 @@ int error; #ifdef DEBUG_PROCGRPS - printk("[%s:%d] setpgrp(%d) ", current->comm, current->pid, flags); + printk(KERN_DEBUG "[%s:%d] setpgrp(%d) ", current->comm, current->pid, flags); #endif if(!flags) error = current->pgrp; else error = sys_setsid(); #ifdef DEBUG_PROCGRPS - printk("returning %d\n", current->pgrp); + printk(KERN_DEBUG "returning %d\n", current->pgrp); #endif return error; @@ -872,7 +872,7 @@ asmlinkage unsigned long irix_gethostid(void) { - printk("[%s:%d]: irix_gethostid() called...\n", + printk(KERN_ERR "[%s:%d]: irix_gethostid() called...\n", current->comm, current->pid); return -EINVAL; @@ -880,7 +880,7 @@ asmlinkage unsigned long irix_sethostid(unsigned long val) { - printk("[%s:%d]: irix_sethostid(%08lx) called...\n", + printk(KERN_ERR "[%s:%d]: irix_sethostid(%08lx) called...\n", current->comm, current->pid, val); return -EINVAL; @@ -1111,7 +1111,7 @@ asmlinkage int irix_madvise(unsigned long addr, int len, int behavior) { - printk("[%s:%d] Wheee.. irix_madvise(%08lx,%d,%d)\n", + printk(KERN_ERR "[%s:%d] Wheee.. irix_madvise(%08lx,%d,%d)\n", current->comm, current->pid, addr, len, behavior); return -EINVAL; @@ -1119,7 +1119,7 @@ asmlinkage int irix_pagelock(char *addr, int len, int op) { - printk("[%s:%d] Wheee.. irix_pagelock(%p,%d,%d)\n", + printk(KERN_ERR "[%s:%d] Wheee.. irix_pagelock(%p,%d,%d)\n", current->comm, current->pid, addr, len, op); return -EINVAL; @@ -1127,7 +1127,7 @@ asmlinkage int irix_quotactl(struct pt_regs *regs) { - printk("[%s:%d] Wheee.. irix_quotactl()\n", + printk(KERN_ERR "[%s:%d] Wheee.. irix_quotactl()\n", current->comm, current->pid); return -EINVAL; @@ -1138,7 +1138,7 @@ int error; #ifdef DEBUG_PROCGRPS - printk("[%s:%d] BSDsetpgrp(%d, %d) ", current->comm, current->pid, + printk(KERN_DEBUG "[%s:%d] BSDsetpgrp(%d, %d) ", current->comm, current->pid, pid, pgrp); #endif if(!pid) @@ -1151,7 +1151,7 @@ error = sys_setpgid(pid, pgrp); #ifdef DEBUG_PROCGRPS - printk("error = %d\n", error); + printk(KERN_DEBUG "error = %d\n", error); #endif return error; @@ -1159,7 +1159,7 @@ asmlinkage int irix_systeminfo(int cmd, char *buf, int cnt) { - printk("[%s:%d] Wheee.. irix_systeminfo(%d,%p,%d)\n", + printk(KERN_ERR "[%s:%d] Wheee.. irix_systeminfo(%d,%p,%d)\n", current->comm, current->pid, cmd, buf, cnt); return -EINVAL; @@ -1287,7 +1287,7 @@ struct kstat stat; #ifdef DEBUG_XSTAT - printk("[%s:%d] Wheee.. irix_xstat(%d,%s,%p) ", + printk(KERN_DEBUG "[%s:%d] Wheee.. irix_xstat(%d,%s,%p) ", current->comm, current->pid, version, filename, statbuf); #endif @@ -1314,7 +1314,7 @@ struct kstat stat; #ifdef DEBUG_XSTAT - printk("[%s:%d] Wheee.. irix_lxstat(%d,%s,%p) ", + printk(KERN_DEBUG "[%s:%d] Wheee.. irix_lxstat(%d,%s,%p) ", current->comm, current->pid, version, filename, statbuf); #endif @@ -1342,7 +1342,7 @@ struct kstat stat; #ifdef DEBUG_XSTAT - printk("[%s:%d] Wheee.. irix_fxstat(%d,%d,%p) ", + printk(KERN_DEBUG "[%s:%d] Wheee.. irix_fxstat(%d,%d,%p) ", current->comm, current->pid, version, fd, statbuf); #endif @@ -1369,7 +1369,7 @@ { int retval; - printk("[%s:%d] Wheee.. irix_xmknod(%d,%s,%x,%x)\n", + printk(KERN_ERR "[%s:%d] Wheee.. irix_xmknod(%d,%s,%x,%x)\n", current->comm, current->pid, ver, filename, mode, (int) dev); switch(ver) { @@ -1387,7 +1387,7 @@ asmlinkage int irix_swapctl(int cmd, char *arg) { - printk("[%s:%d] Wheee.. irix_swapctl(%d,%p)\n", + printk(KERN_ERR "[%s:%d] Wheee.. irix_swapctl(%d,%p)\n", current->comm, current->pid, cmd, arg); return -EINVAL; @@ -1407,7 +1407,7 @@ struct statfs kbuf; int error, i; - printk("[%s:%d] Wheee.. irix_statvfs(%s,%p)\n", + printk(KERN_ERR "[%s:%d] Wheee.. irix_statvfs(%s,%p)\n", current->comm, current->pid, fname, buf); error = verify_area(VERIFY_WRITE, buf, sizeof(struct irix_statvfs)); if (error) @@ -1453,7 +1453,7 @@ struct file *file; int error, i; - printk("[%s:%d] Wheee.. irix_fstatvfs(%d,%p)\n", + printk(KERN_ERR "[%s:%d] Wheee.. irix_fstatvfs(%d,%p)\n", current->comm, current->pid, fd, buf); error = verify_area(VERIFY_WRITE, buf, sizeof(struct irix_statvfs)); @@ -1494,7 +1494,7 @@ asmlinkage int irix_priocntl(struct pt_regs *regs) { - printk("[%s:%d] Wheee.. irix_priocntl()\n", + printk(KERN_ERR "[%s:%d] Wheee.. irix_priocntl()\n", current->comm, current->pid); return -EINVAL; @@ -1502,7 +1502,7 @@ asmlinkage int irix_sigqueue(int pid, int sig, int code, int val) { - printk("[%s:%d] Wheee.. irix_sigqueue(%d,%d,%d,%d)\n", + printk(KERN_ERR "[%s:%d] Wheee.. irix_sigqueue(%d,%d,%d,%d)\n", current->comm, current->pid, pid, sig, code, val); return -EINVAL; @@ -1615,7 +1615,7 @@ asmlinkage int irix_dmi(struct pt_regs *regs) { - printk("[%s:%d] Wheee.. irix_dmi()\n", + printk(KERN_ERR "[%s:%d] Wheee.. irix_dmi()\n", current->comm, current->pid); return -EINVAL; @@ -1624,7 +1624,7 @@ asmlinkage int irix_pread(int fd, char *buf, int cnt, int off64, int off1, int off2) { - printk("[%s:%d] Wheee.. irix_pread(%d,%p,%d,%d,%d,%d)\n", + printk(KERN_ERR "[%s:%d] Wheee.. irix_pread(%d,%p,%d,%d,%d,%d)\n", current->comm, current->pid, fd, buf, cnt, off64, off1, off2); return -EINVAL; @@ -1633,7 +1633,7 @@ asmlinkage int irix_pwrite(int fd, char *buf, int cnt, int off64, int off1, int off2) { - printk("[%s:%d] Wheee.. irix_pwrite(%d,%p,%d,%d,%d,%d)\n", + printk(KERN_ERR "[%s:%d] Wheee.. irix_pwrite(%d,%p,%d,%d,%d,%d)\n", current->comm, current->pid, fd, buf, cnt, off64, off1, off2); return -EINVAL; @@ -1643,7 +1643,7 @@ unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5) { - printk("[%s:%d] Wheee.. irix_fastpath(%d,%08lx,%08lx,%08lx,%08lx," + printk(KERN_ERR "[%s:%d] Wheee.. irix_fastpath(%d,%08lx,%08lx,%08lx,%08lx," "%08lx,%08lx)\n", current->comm, current->pid, cmd, arg0, arg1, arg2, arg3, arg4, arg5); @@ -1668,7 +1668,7 @@ struct statfs kbuf; int error, i; - printk("[%s:%d] Wheee.. irix_statvfs(%s,%p)\n", + printk(KERN_ERR "[%s:%d] Wheee.. irix_statvfs(%s,%p)\n", current->comm, current->pid, fname, buf); error = verify_area(VERIFY_WRITE, buf, sizeof(struct irix_statvfs)); if(error) @@ -1714,7 +1714,7 @@ struct file *file; int error, i; - printk("[%s:%d] Wheee.. irix_fstatvfs(%d,%p)\n", + printk(KERN_ERR "[%s:%d] Wheee.. irix_fstatvfs(%d,%p)\n", current->comm, current->pid, fd, buf); error = verify_area(VERIFY_WRITE, buf, sizeof(struct irix_statvfs)); @@ -1757,7 +1757,7 @@ { int err; - printk("[%s:%d] irix_getmountid(%s, %p)\n", + printk(KERN_ERR "[%s:%d] irix_getmountid(%s, %p)\n", current->comm, current->pid, fname, midbuf); err = verify_area(VERIFY_WRITE, midbuf, (sizeof(unsigned long) * 4)); if (err) @@ -1780,7 +1780,7 @@ asmlinkage int irix_nsproc(unsigned long entry, unsigned long mask, unsigned long arg, unsigned long sp, int slen) { - printk("[%s:%d] Wheee.. irix_nsproc(%08lx,%08lx,%08lx,%08lx,%d)\n", + printk(KERN_ERR "[%s:%d] Wheee.. irix_nsproc(%08lx,%08lx,%08lx,%08lx,%d)\n", current->comm, current->pid, entry, mask, arg, sp, slen); return -EINVAL; @@ -1814,7 +1814,7 @@ unsigned short reclen = ROUND_UP32(NAME_OFFSET32(dirent) + namlen + 1); #ifdef DEBUG_GETDENTS - printk("\nirix_filldir32[reclen<%d>namlen<%d>count<%d>]", + printk(KERN_DEBUG "\nirix_filldir32[reclen<%d>namlen<%d>count<%d>]", reclen, namlen, buf->count); #endif buf->error = -EINVAL; /* only used if we fail.. */ @@ -1845,7 +1845,7 @@ int error; #ifdef DEBUG_GETDENTS - printk("[%s:%d] ngetdents(%d, %p, %d, %p) ", current->comm, + printk(KERN_DEBUG "[%s:%d] ngetdents(%d, %p, %d, %p) ", current->comm, current->pid, fd, dirent, count, eob); #endif error = -EBADF; @@ -1875,7 +1875,7 @@ } #ifdef DEBUG_GETDENTS - printk("eob=%d returning %d\n", *eob, count - buf.count); + printk(KERN_DEBUG "eob=%d returning %d\n", *eob, count - buf.count); #endif error = count - buf.count; @@ -1937,7 +1937,7 @@ int error; #ifdef DEBUG_GETDENTS - printk("[%s:%d] getdents64(%d, %p, %d) ", current->comm, + printk(KERN_DEBUG "[%s:%d] getdents64(%d, %p, %d) ", current->comm, current->pid, fd, dirent, cnt); #endif error = -EBADF; @@ -1966,7 +1966,7 @@ } lastdirent->d_off = (u64) file->f_pos; #ifdef DEBUG_GETDENTS - printk("returning %d\n", cnt - buf.count); + printk(KERN_DEBUG "returning %d\n", cnt - buf.count); #endif error = cnt - buf.count; @@ -1984,7 +1984,7 @@ int error; #ifdef DEBUG_GETDENTS - printk("[%s:%d] ngetdents64(%d, %p, %d) ", current->comm, + printk(KERN_DEBUG "[%s:%d] ngetdents64(%d, %p, %d) ", current->comm, current->pid, fd, dirent, cnt); #endif error = -EBADF; @@ -2015,7 +2015,7 @@ } lastdirent->d_off = (u64) file->f_pos; #ifdef DEBUG_GETDENTS - printk("eob=%d returning %d\n", *eob, cnt - buf.count); + printk(KERN_DEBUG "eob=%d returning %d\n", *eob, cnt - buf.count); #endif error = cnt - buf.count; @@ -2032,41 +2032,41 @@ switch (op) { case 1: /* Reboot */ - printk("[%s:%d] irix_uadmin: Wants to reboot...\n", + printk(KERN_WARNING "[%s:%d] irix_uadmin: Wants to reboot...\n", current->comm, current->pid); retval = -EINVAL; goto out; case 2: /* Shutdown */ - printk("[%s:%d] irix_uadmin: Wants to shutdown...\n", + printk(KERN_WARNING "[%s:%d] irix_uadmin: Wants to shutdown...\n", current->comm, current->pid); retval = -EINVAL; goto out; case 4: /* Remount-root */ - printk("[%s:%d] irix_uadmin: Wants to remount root...\n", + printk(KERN_WARNING "[%s:%d] irix_uadmin: Wants to remount root...\n", current->comm, current->pid); retval = -EINVAL; goto out; case 8: /* Kill all tasks. */ - printk("[%s:%d] irix_uadmin: Wants to kill all tasks...\n", + printk(KERN_WARNING "[%s:%d] irix_uadmin: Wants to kill all tasks...\n", current->comm, current->pid); retval = -EINVAL; goto out; case 256: /* Set magic mushrooms... */ - printk("[%s:%d] irix_uadmin: Wants to set magic mushroom[%d]...\n", + printk(KERN_WARNING "[%s:%d] irix_uadmin: Wants to set magic mushroom[%d]...\n", current->comm, current->pid, (int) func); retval = -EINVAL; goto out; default: - printk("[%s:%d] irix_uadmin: Unknown operation [%d]...\n", + printk(KERN_ERR "[%s:%d] irix_uadmin: Unknown operation [%d]...\n", current->comm, current->pid, (int) op); retval = -EINVAL; goto out; @@ -2088,20 +2088,20 @@ case 2: /* ustat() */ - printk("[%s:%d] irix_utssys: Wants to do ustat()\n", + printk(KERN_ERR "[%s:%d] irix_utssys: Wants to do ustat()\n", current->comm, current->pid); retval = -EINVAL; goto out; case 3: /* fusers() */ - printk("[%s:%d] irix_utssys: Wants to do fusers()\n", + printk(KERN_ERR "[%s:%d] irix_utssys: Wants to do fusers()\n", current->comm, current->pid); retval = -EINVAL; goto out; default: - printk("[%s:%d] irix_utssys: Wants to do unknown type[%d]\n", + printk(KERN_ERR "[%s:%d] irix_utssys: Wants to do unknown type[%d]\n", current->comm, current->pid, (int) type); retval = -EINVAL; goto out; @@ -2123,7 +2123,7 @@ int retval; #ifdef DEBUG_FCNTL - printk("[%s:%d] irix_fcntl(%d, %d, %d) ", current->comm, + printk(KERN_DEBUG "[%s:%d] irix_fcntl(%d, %d, %d) ", current->comm, current->pid, fd, cmd, arg); #endif if (cmd == IRIX_F_ALLOCSP){ @@ -2131,7 +2131,7 @@ } retval = sys_fcntl(fd, cmd, arg); #ifdef DEBUG_FCNTL - printk("%d\n", retval); + printk(KERN_DEBUG "%d\n", retval); #endif return retval; } @@ -2142,26 +2142,26 @@ switch(cmd) { case 1: - printk("[%s:%d] irix_ulimit: Wants to get file size limit.\n", + printk(KERN_WARNING "[%s:%d] irix_ulimit: Wants to get file size limit.\n", current->comm, current->pid); retval = -EINVAL; goto out; case 2: - printk("[%s:%d] irix_ulimit: Wants to set file size limit.\n", + printk(KERN_WARNING "[%s:%d] irix_ulimit: Wants to set file size limit.\n", current->comm, current->pid); retval = -EINVAL; goto out; case 3: - printk("[%s:%d] irix_ulimit: Wants to get brk limit.\n", + printk(KERN_WARNING "[%s:%d] irix_ulimit: Wants to get brk limit.\n", current->comm, current->pid); retval = -EINVAL; goto out; case 4: #if 0 - printk("[%s:%d] irix_ulimit: Wants to get fd limit.\n", + printk(KERN_WARNING "[%s:%d] irix_ulimit: Wants to get fd limit.\n", current->comm, current->pid); retval = -EINVAL; goto out; @@ -2170,13 +2170,13 @@ goto out; case 5: - printk("[%s:%d] irix_ulimit: Wants to get txt offset.\n", + printk(KERN_WARNING "[%s:%d] irix_ulimit: Wants to get txt offset.\n", current->comm, current->pid); retval = -EINVAL; goto out; default: - printk("[%s:%d] irix_ulimit: Unknown command [%d].\n", + printk(KERN_WARNING "[%s:%d] irix_ulimit: Unknown command [%d].\n", current->comm, current->pid, cmd); retval = -EINVAL; goto out; @@ -2187,7 +2187,7 @@ asmlinkage int irix_unimp(struct pt_regs *regs) { - printk("irix_unimp [%s:%d] v0=%d v1=%d a0=%08lx a1=%08lx a2=%08lx " + printk(KERN_EMERG "irix_unimp [%s:%d] v0=%d v1=%d a0=%08lx a1=%08lx a2=%08lx " "a3=%08lx\n", current->comm, current->pid, (int) regs->regs[2], (int) regs->regs[3], regs->regs[4], regs->regs[5], regs->regs[6], regs->regs[7]); diff -urN linux-2.6.0-test1/arch/mips/kernel/traps.c linux-2.6.0-test1-printk-mips/arch/mips/kernel/traps.c --- linux-2.6.0-test1/arch/mips/kernel/traps.c 2003-07-13 23:33:45.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/kernel/traps.c 2003-07-17 17:32:18.000000000 -0400 @@ -80,25 +80,25 @@ sp = sp ? sp : (unsigned long *) &sp; - printk("Stack: "); + printk(KERN_EMERG "Stack: "); i = 1; while ((unsigned long) sp & (PAGE_SIZE - 1)) { if (i && ((i % (64 / sizeof(unsigned long))) == 0)) - printk("\n "); + printk(KERN_EMERG "\n "); if (i > 40) { - printk(" ..."); + printk(KERN_EMERG " ..."); break; } if (__get_user(stackdata, sp++)) { - printk(" (Bad stack address)"); + printk(KERN_EMERG " (Bad stack address)"); break; } - printk(" %0*lx", field, stackdata); + printk(KERN_EMERG " %0*lx", field, stackdata); i++; } - printk("\n"); + printk(KERN_EMERG "\n"); } void show_trace(struct task_struct *task, unsigned long *stack) @@ -109,18 +109,18 @@ if (!stack) stack = (unsigned long*)&stack; - printk("Call Trace:"); + printk(KERN_EMERG "Call Trace:"); #ifdef CONFIG_KALLSYMS - printk("\n"); + printk(KERN_EMERG "\n"); #endif while (((long) stack & (THREAD_SIZE-1)) != 0) { addr = *stack++; if (kernel_text_address(addr)) { - printk(" [<%0*lx>] ", field, addr); + printk(KERN_EMERG " [<%0*lx>] ", field, addr); print_symbol("%s\n", addr); } } - printk("\n"); + printk(KERN_EMERG "\n"); } void show_trace_task(struct task_struct *tsk) @@ -142,15 +142,15 @@ { long i; - printk("\nCode:"); + printk(KERN_EMERG "\nCode:"); for(i = -3 ; i < 6 ; i++) { unsigned int insn; if (__get_user(insn, pc + i)) { - printk(" (Bad address in epc)\n"); + printk(KERN_EMERG " (Bad address in epc)\n"); break; } - printk("%c%08x%c", (i?' ':'<'), insn, (i?' ':'>')); + printk(KERN_EMERG "%c%08x%c", (i?' ':'<'), insn, (i?' ':'>')); } } @@ -159,62 +159,62 @@ const int field = 2 * sizeof(unsigned long); int i; - printk("Cpu %d\n", smp_processor_id()); + printk(KERN_EMERG "Cpu %d\n", smp_processor_id()); /* * Saved main processor registers */ for (i = 0; i < 32; i++) { if ((i % 4) == 0) - printk("$%2d :", i); + printk(KERN_EMERG "$%2d :", i); if (i == 0) - printk(" %0*lx", field, 0UL); + printk(KERN_EMERG " %0*lx", field, 0UL); else if (i == 26 || i == 27) - printk(" %*s", field, ""); + printk(KERN_EMERG " %*s", field, ""); else - printk(" %0*lx", field, regs->regs[i]); + printk(KERN_EMERG " %0*lx", field, regs->regs[i]); i++; if ((i % 4) == 0) - printk("\n"); + printk(KERN_EMERG "\n"); } - printk("Hi : %0*lx\n", field, regs->hi); - printk("Lo : %0*lx\n", field, regs->lo); + printk(KERN_EMERG "Hi : %0*lx\n", field, regs->hi); + printk(KERN_EMERG "Lo : %0*lx\n", field, regs->lo); /* * Saved cp0 registers */ - printk("epc : %0*lx %s\n", field, regs->cp0_epc, print_tainted()); - printk("Status: %0*lx\n", field, regs->cp0_status); - printk("Cause : %0*lx\n", field, regs->cp0_cause); + printk(KERN_EMERG "epc : %0*lx %s\n", field, regs->cp0_epc, print_tainted()); + printk(KERN_EMERG "Status: %0*lx\n", field, regs->cp0_status); + printk(KERN_EMERG "Cause : %0*lx\n", field, regs->cp0_cause); if (regs->cp0_status & ST0_KX) - printk("KX "); + printk(KERN_EMERG "KX "); if (regs->cp0_status & ST0_SX) - printk("SX "); + printk(KERN_EMERG "SX "); if (regs->cp0_status & ST0_UX) - printk("UX "); + printk(KERN_EMERG "UX "); switch (regs->cp0_status & ST0_KSU) { case KSU_USER: - printk("USER "); + printk(KERN_EMERG "USER "); break; case KSU_SUPERVISOR: - printk("SUPERVISOR "); + printk(KERN_EMERG "SUPERVISOR "); break; case KSU_KERNEL: - printk("KERNEL "); + printk(KERN_EMERG "KERNEL "); break; default: - printk("BAD_MODE "); + printk(KERN_EMERG "BAD_MODE "); break; } if (regs->cp0_status & ST0_ERL) - printk("ERL "); + printk(KERN_EMERG "ERL "); if (regs->cp0_status & ST0_EXL) - printk("EXL "); + printk(KERN_EMERG "EXL "); if (regs->cp0_status & ST0_IE) - printk("IE "); + printk(KERN_EMERG "IE "); } void show_registers(struct pt_regs *regs) @@ -222,12 +222,12 @@ const int field = 2 * sizeof(unsigned long); show_regs(regs); - printk("Process %s (pid: %d, stackpage=%0*lx)\n", + printk(KERN_EMERG "Process %s (pid: %d, stackpage=%0*lx)\n", current->comm, current->pid, field, (unsigned long) current); show_stack(current, (long *) regs->regs[29]); show_trace(current, (long *) regs->regs[29]); show_code((unsigned int *) regs->cp0_epc); - printk("\n"); + printk(KERN_EMERG "\n"); } static spinlock_t die_lock = SPIN_LOCK_UNLOCKED; @@ -239,10 +239,10 @@ console_verbose(); spin_lock_irq(&die_lock); - printk("%s", str); + printk(KERN_EMERG "%s", str); if (file && func) - printk(" in %s:%s, line %ld", file, func, line); - printk("[#%d]:\n", ++die_counter); + printk(KERN_EMERG " in %s:%s, line %ld", file, func, line); + printk(KERN_EMERG "[#%d]:\n", ++die_counter); show_registers(regs); spin_unlock_irq(&die_lock); do_exit(SIGSEGV); @@ -700,15 +700,15 @@ unsigned int reg_val; /* For the moment, report the problem and hang. */ - printk("Cache error exception:\n"); - printk("cp0_errorepc == %0*lx\n", field, read_c0_errorepc()); + printk(KERN_EMERG "Cache error exception:\n"); + printk(KERN_EMERG "cp0_errorepc == %0*lx\n", field, read_c0_errorepc()); reg_val = read_c0_cacheerr(); - printk("c0_cacheerr == %08x\n", reg_val); + printk(KERN_EMERG "c0_cacheerr == %08x\n", reg_val); - printk("Decoded c0_cacheerr: %s cache fault in %s reference.\n", + printk(KERN_EMERG "Decoded c0_cacheerr: %s cache fault in %s reference.\n", reg_val & (1<<30) ? "secondary" : "primary", reg_val & (1<<31) ? "data" : "insn"); - printk("Error bits: %s%s%s%s%s%s%s\n", + printk(KERN_EMERG "Error bits: %s%s%s%s%s%s%s\n", reg_val & (1<<29) ? "ED " : "", reg_val & (1<<28) ? "ET " : "", reg_val & (1<<26) ? "EE " : "", @@ -716,14 +716,14 @@ reg_val & (1<<24) ? "EI " : "", reg_val & (1<<23) ? "E1 " : "", reg_val & (1<<22) ? "E0 " : ""); - printk("IDX: 0x%08x\n", reg_val & ((1<<22)-1)); + printk(KERN_EMERG "IDX: 0x%08x\n", reg_val & ((1<<22)-1)); #if defined(CONFIG_CPU_MIPS32) || defined (CONFIG_CPU_MIPS64) if (reg_val & (1<<22)) - printk("DErrAddr0: 0x%08x\n", read_c0_derraddr0()); + printk(KERN_EMERG "DErrAddr0: 0x%08x\n", read_c0_derraddr0()); if (reg_val & (1<<23)) - printk("DErrAddr1: 0x%08x\n", read_c0_derraddr1()); + printk(KERN_EMERG "DErrAddr1: 0x%08x\n", read_c0_derraddr1()); #endif panic("Can't handle the cache error!"); @@ -739,10 +739,10 @@ unsigned long depc, old_epc; unsigned int debug; - printk("SDBBP EJTAG debug exception - not handled yet, just ignored!\n"); + printk(KERN_DEBUG "SDBBP EJTAG debug exception - not handled yet, just ignored!\n"); depc = read_c0_depc(); debug = read_c0_debug(); - printk("c0_depc = %0*lx, DEBUG = %08x\n", field, depc, debug); + printk(KERN_DEBUG "c0_depc = %0*lx, DEBUG = %08x\n", field, depc, debug); if (debug & 0x80000000) { /* * In branch delay slot. @@ -760,7 +760,7 @@ write_c0_depc(depc); #if 0 - printk("\n\n----- Enable EJTAG single stepping ----\n\n"); + printk(KERN_DEBUG "\n\n----- Enable EJTAG single stepping ----\n\n"); write_c0_debug(debug | 0x100); #endif } @@ -770,7 +770,7 @@ */ void nmi_exception_handler(struct pt_regs *regs) { - printk("NMI taken!!!!\n"); + printk(KERN_EMERG "NMI taken!!!!\n"); die("NMI", regs); while(1) ; } diff -urN linux-2.6.0-test1/arch/mips/lasat/interrupt.c linux-2.6.0-test1-printk-mips/arch/mips/lasat/interrupt.c --- linux-2.6.0-test1/arch/mips/lasat/interrupt.c 2003-07-13 23:35:15.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/lasat/interrupt.c 2003-07-16 15:19:03.000000000 -0400 @@ -142,7 +142,7 @@ /* if action == NULL, then we don't have a handler for the irq */ if (action == NULL) { - printk("No handler for hw0 irq: %i\n", irq); + printk(KERN_WARNING "No handler for hw0 irq: %i\n", irq); atomic_inc(&irq_err_count); disable_lasat_irq(irq); return; @@ -171,7 +171,7 @@ *lasat_int_mask = 0; break; case MACH_LASAT_200: - printk("**** MACH_LASAT_200 interrupt routines\n"); + printk(KERN_NOTICE "**** MACH_LASAT_200 interrupt routines\n"); lasat_int_status = (void *)LASAT_INT_STATUS_REG_200; lasat_int_mask = (void *)LASAT_INT_MASK_REG_200; lasat_int_mask_shift = LASATINT_MASK_SHIFT_200; diff -urN linux-2.6.0-test1/arch/mips/lasat/picvue_proc.c linux-2.6.0-test1-printk-mips/arch/mips/lasat/picvue_proc.c --- linux-2.6.0-test1/arch/mips/lasat/picvue_proc.c 2003-07-13 23:29:29.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/lasat/picvue_proc.c 2003-07-16 15:16:42.000000000 -0400 @@ -43,7 +43,7 @@ int lineno = *(int *)data; if (lineno < 0 || lineno > PVC_NLINES) { - printk("proc_read_line: invalid lineno %d\n", lineno); + printk(KERN_ERR "proc_read_line: invalid lineno %d\n", lineno); return 0; } @@ -61,7 +61,7 @@ int lineno = *(int *)data; if (lineno < 0 || lineno > PVC_NLINES) { - printk("proc_write_line: invalid lineno %d\n", lineno); + printk(KERN_ERR "proc_write_line: invalid lineno %d\n", lineno); return origcount; } diff -urN linux-2.6.0-test1/arch/mips/lasat/reset.c linux-2.6.0-test1-printk-mips/arch/mips/lasat/reset.c --- linux-2.6.0-test1/arch/mips/lasat/reset.c 2003-07-13 23:33:12.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/lasat/reset.c 2003-07-16 15:17:52.000000000 -0400 @@ -42,7 +42,7 @@ local_irq_disable(); if (lasat_boot_to_service) { - printk("machine_restart: Rebooting to service mode\n"); + printk(KERN_ALERT "machine_restart: Rebooting to service mode\n"); *(volatile unsigned int *)0xa0000024 = 0xdeadbeef; *(volatile unsigned int *)0xa00000fc = 0xfedeabba; } diff -urN linux-2.6.0-test1/arch/mips/lib/dump_tlb.c linux-2.6.0-test1-printk-mips/arch/mips/lib/dump_tlb.c --- linux-2.6.0-test1/arch/mips/lib/dump_tlb.c 2003-07-13 23:34:33.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/lib/dump_tlb.c 2003-07-17 20:16:34.000000000 -0400 @@ -43,7 +43,7 @@ asid = read_c0_entryhi() & 0xff; - printk("\n"); + printk(KERN_DEBUG "\n"); for(i=first;i<=last;i++) { write_c0_index(i); __asm__ __volatile__( @@ -65,24 +65,24 @@ /* * Only print entries in use */ - printk("Index: %2d pgmask=%s ", i, msg2str(pagemask)); + printk(KERN_DEBUG "Index: %2d pgmask=%s ", i, msg2str(pagemask)); c0 = (entrylo0 >> 3) & 7; c1 = (entrylo1 >> 3) & 7; - printk("va=%08lx asid=%02lx\n", + printk(KERN_DEBUG "va=%08lx asid=%02lx\n", (entryhi & 0xffffe000), (entryhi & 0xff)); - printk("\t\t\t[pa=%08Lx c=%d d=%d v=%d g=%Ld]\n", + printk(KERN_DEBUG "\t\t\t[pa=%08Lx c=%d d=%d v=%d g=%Ld]\n", (entrylo0 << 6) & PAGE_MASK, c0, (entrylo0 & 4) ? 1 : 0, (entrylo0 & 2) ? 1 : 0, (entrylo0 & 1)); - printk("\t\t\t[pa=%08Lx c=%d d=%d v=%d g=%Ld]\n", + printk(KERN_DEBUG "\t\t\t[pa=%08Lx c=%d d=%d v=%d g=%Ld]\n", (entrylo1 << 6) & PAGE_MASK, c1, (entrylo1 & 4) ? 1 : 0, (entrylo1 & 2) ? 1 : 0, (entrylo1 & 1)); - printk("\n"); + printk(KERN_DEBUG "\n"); } } @@ -99,7 +99,7 @@ int wired; wired = read_c0_wired(); - printk("Wired: %d", wired); + printk(KERN_DEBUG "Wired: %d", wired); dump_tlb(0, read_c0_wired()); } @@ -127,11 +127,11 @@ local_irq_restore(flags); if (index < 0) { - printk("No entry for address 0x%08lx in TLB\n", addr); + printk(KERN_DEBUG "No entry for address 0x%08lx in TLB\n", addr); return; } - printk("Entry %d maps address 0x%08lx\n", index, addr); + printk(KERN_DEBUG "Entry %d maps address 0x%08lx\n", index, addr); dump_tlb(index, index); } @@ -152,46 +152,46 @@ addr = (unsigned int) address; - printk("Addr == %08x\n", addr); - printk("task == %8p\n", t); - printk("task->mm == %8p\n", t->mm); - //printk("tasks->mm.pgd == %08x\n", (unsigned int) t->mm->pgd); + printk(KERN_DEBUG "Addr == %08x\n", addr); + printk(KERN_DEBUG "task == %8p\n", t); + printk(KERN_DEBUG "task->mm == %8p\n", t->mm); + //printk(KERN_DEBUG "tasks->mm.pgd == %08x\n", (unsigned int) t->mm->pgd); if (addr > KSEG0) page_dir = pgd_offset_k(0); else page_dir = pgd_offset(t->mm, 0); - printk("page_dir == %08x\n", (unsigned int) page_dir); + printk(KERN_DEBUG "page_dir == %08x\n", (unsigned int) page_dir); if (addr > KSEG0) pgd = pgd_offset_k(addr); else pgd = pgd_offset(t->mm, addr); - printk("pgd == %08x, ", (unsigned int) pgd); + printk(KERN_DEBUG "pgd == %08x, ", (unsigned int) pgd); pmd = pmd_offset(pgd, addr); - printk("pmd == %08x, ", (unsigned int) pmd); + printk(KERN_DEBUG "pmd == %08x, ", (unsigned int) pmd); pte = pte_offset(pmd, addr); - printk("pte == %08x, ", (unsigned int) pte); + printk(KERN_DEBUG "pte == %08x, ", (unsigned int) pte); page = *pte; #ifdef CONFIG_64BIT_PHYS_ADDR - printk("page == %08Lx\n", pte_val(page)); + printk(KERN_DEBUG "page == %08Lx\n", pte_val(page)); #else - printk("page == %08lx\n", pte_val(page)); + printk(KERN_DEBUG "page == %08lx\n", pte_val(page)); #endif val = pte_val(page); - if (val & _PAGE_PRESENT) printk("present "); - if (val & _PAGE_READ) printk("read "); - if (val & _PAGE_WRITE) printk("write "); - if (val & _PAGE_ACCESSED) printk("accessed "); - if (val & _PAGE_MODIFIED) printk("modified "); - if (val & _PAGE_R4KBUG) printk("r4kbug "); - if (val & _PAGE_GLOBAL) printk("global "); - if (val & _PAGE_VALID) printk("valid "); - printk("\n"); + if (val & _PAGE_PRESENT) printk(KERN_DEBUG "present "); + if (val & _PAGE_READ) printk(KERN_DEBUG "read "); + if (val & _PAGE_WRITE) printk(KERN_DEBUG "write "); + if (val & _PAGE_ACCESSED) printk(KERN_DEBUG "accessed "); + if (val & _PAGE_MODIFIED) printk(KERN_DEBUG "modified "); + if (val & _PAGE_R4KBUG) printk(KERN_DEBUG "r4kbug "); + if (val & _PAGE_GLOBAL) printk(KERN_DEBUG "global "); + if (val & _PAGE_VALID) printk(KERN_DEBUG "valid "); + printk(KERN_DEBUG "\n"); } void @@ -225,7 +225,7 @@ for(i=0;i<8;i++) { - printk("*%8p = %08lx, ", p, *p); p++; - printk("*%8p = %08lx\n", p, *p); p++; + printk(KERN_DEBUG "*%8p = %08lx, ", p, *p); p++; + printk(KERN_DEBUG "*%8p = %08lx\n", p, *p); p++; } } diff -urN linux-2.6.0-test1/arch/mips/lib/r3k_dump_tlb.c linux-2.6.0-test1-printk-mips/arch/mips/lib/r3k_dump_tlb.c --- linux-2.6.0-test1/arch/mips/lib/r3k_dump_tlb.c 2003-07-13 23:30:38.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/lib/r3k_dump_tlb.c 2003-07-17 20:15:29.000000000 -0400 @@ -45,9 +45,9 @@ /* * Only print entries in use */ - printk("Index: %2d ", i); + printk(KERN_DEBUG "Index: %2d ", i); - printk("va=%08lx asid=%08lx" + printk(KERN_DEBUG "va=%08lx asid=%08lx" " [pa=%06lx n=%d d=%d v=%d g=%d]", (entryhi & 0xffffe000), entryhi & 0xfc0, @@ -58,7 +58,7 @@ (entrylo0 & (1 << 8)) ? 1 : 0); } } - printk("\n"); + printk(KERN_DEBUG "\n"); write_c0_entryhi(asid); } @@ -74,7 +74,7 @@ { int wired = r3k_have_wired_reg ? read_c0_wired() : 8; - printk("Wired: %d", wired); + printk(KERN_DEBUG "Wired: %d", wired); dump_tlb(0, wired - 1); } @@ -93,11 +93,11 @@ local_irq_restore(flags); if (index < 0) { - printk("No entry for address 0x%08lx in TLB\n", addr); + printk(KERN_DEBUG "No entry for address 0x%08lx in TLB\n", addr); return; } - printk("Entry %d maps address 0x%08lx\n", index, addr); + printk(KERN_DEBUG "Entry %d maps address 0x%08lx\n", index, addr); dump_tlb(index, index); } @@ -119,33 +119,33 @@ addr = (unsigned int) address; - printk("Addr == %08x\n", addr); - printk("tasks->mm.pgd == %08x\n", (unsigned int) t->mm->pgd); + printk(KERN_DEBUG "Addr == %08x\n", addr); + printk(KERN_DEBUG "tasks->mm.pgd == %08x\n", (unsigned int) t->mm->pgd); page_dir = pgd_offset(t->mm, 0); - printk("page_dir == %08x\n", (unsigned int) page_dir); + printk(KERN_DEBUG "page_dir == %08x\n", (unsigned int) page_dir); pgd = pgd_offset(t->mm, addr); - printk("pgd == %08x, ", (unsigned int) pgd); + printk(KERN_DEBUG "pgd == %08x, ", (unsigned int) pgd); pmd = pmd_offset(pgd, addr); - printk("pmd == %08x, ", (unsigned int) pmd); + printk(KERN_DEBUG "pmd == %08x, ", (unsigned int) pmd); pte = pte_offset(pmd, addr); - printk("pte == %08x, ", (unsigned int) pte); + printk(KERN_DEBUG "pte == %08x, ", (unsigned int) pte); page = *pte; - printk("page == %08x\n", (unsigned int) pte_val(page)); + printk(KERN_DEBUG "page == %08x\n", (unsigned int) pte_val(page)); val = pte_val(page); - if (val & _PAGE_PRESENT) printk("present "); - if (val & _PAGE_READ) printk("read "); - if (val & _PAGE_WRITE) printk("write "); - if (val & _PAGE_ACCESSED) printk("accessed "); - if (val & _PAGE_MODIFIED) printk("modified "); - if (val & _PAGE_GLOBAL) printk("global "); - if (val & _PAGE_VALID) printk("valid "); - printk("\n"); + if (val & _PAGE_PRESENT) printk(KERN_DEBUG "present "); + if (val & _PAGE_READ) printk(KERN_DEBUG "read "); + if (val & _PAGE_WRITE) printk(KERN_DEBUG "write "); + if (val & _PAGE_ACCESSED) printk(KERN_DEBUG "accessed "); + if (val & _PAGE_MODIFIED) printk(KERN_DEBUG "modified "); + if (val & _PAGE_GLOBAL) printk(KERN_DEBUG "global "); + if (val & _PAGE_VALID) printk(KERN_DEBUG "valid "); + printk(KERN_DEBUG "\n"); } void @@ -179,9 +179,9 @@ for(i=0;i<8;i++) { - printk("*%08lx == %08lx, ", + printk(KERN_DEBUG "*%08lx == %08lx, ", (unsigned long)p, (unsigned long)*p++); - printk("*%08lx == %08lx\n", + printk(KERN_DEBUG "*%08lx == %08lx\n", (unsigned long)p, (unsigned long)*p++); } } diff -urN linux-2.6.0-test1/arch/mips/math-emu/cp1emu.c linux-2.6.0-test1-printk-mips/arch/mips/math-emu/cp1emu.c --- linux-2.6.0-test1/arch/mips/math-emu/cp1emu.c 2003-07-13 23:38:00.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/math-emu/cp1emu.c 2003-07-16 16:28:37.000000000 -0400 @@ -228,7 +228,7 @@ if (__compute_return_epc(xcp)) { #ifdef CP1DBG - printk("failed to emulate branch at %p\n", + printk(KERN_ERR "failed to emulate branch at %p\n", REG_TO_VA(xcp->cp0_epc)); #endif return SIGILL; @@ -373,7 +373,7 @@ if (MIPSInst_RD(ir) == FPCREG_CSR) { value = ctx->sr; #ifdef CSRTRACE - printk("%p gpr[%d]<-csr=%08x\n", + printk(KERN_DEBUG "%p gpr[%d]<-csr=%08x\n", REG_TO_VA(xcp->cp0_epc), MIPSInst_RT(ir), value); #endif @@ -400,7 +400,7 @@ */ if (MIPSInst_RD(ir) == FPCREG_CSR) { #ifdef CSRTRACE - printk("%p gpr[%d]->csr=%08x\n", + printk(KERN_DEBUG "%p gpr[%d]->csr=%08x\n", REG_TO_VA(xcp->cp0_epc), MIPSInst_RT(ir), value); #endif @@ -705,7 +705,7 @@ if (ieee754_csr.nod) ctx->sr |= 0x1000000; if ((ctx->sr >> 5) & ctx->sr & FPU_CSR_ALL_E) { - /*printk ("SIGFPE: fpu csr = %08x\n", + /*printk (KERN_WARNING "SIGFPE: fpu csr = %08x\n", ctx->sr); */ return SIGFPE; } @@ -1239,7 +1239,7 @@ */ ctx->sr = (ctx->sr & ~FPU_CSR_ALL_X) | rcsr; if ((ctx->sr >> 5) & ctx->sr & FPU_CSR_ALL_E) { - /*printk ("SIGFPE: fpu csr = %08x\n",ctx->sr); */ + /*printk (KERN_WARNING "SIGFPE: fpu csr = %08x\n",ctx->sr); */ return SIGFPE; } diff -urN linux-2.6.0-test1/arch/mips/math-emu/dsemul.c linux-2.6.0-test1-printk-mips/arch/mips/math-emu/dsemul.c --- linux-2.6.0-test1/arch/mips/math-emu/dsemul.c 2003-07-13 23:30:36.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/math-emu/dsemul.c 2003-07-16 16:25:03.000000000 -0400 @@ -68,7 +68,7 @@ return 0; } #ifdef DSEMUL_TRACE - printk("dsemul %lx %lx\n", regs->cp0_epc, cpc); + printk(KERN_DEBUG "dsemul %lx %lx\n", regs->cp0_epc, cpc); #endif @@ -157,7 +157,7 @@ */ #ifdef DSEMUL_TRACE - printk("dsemulret\n"); + printk(KERN_DEBUG "dsemulret\n"); #endif if (__get_user(epc, &fr->epc)) { /* Saved EPC */ /* This is not a good situation to be in */ diff -urN linux-2.6.0-test1/arch/mips/math-emu/ieee754d.c linux-2.6.0-test1-printk-mips/arch/mips/math-emu/ieee754d.c --- linux-2.6.0-test1/arch/mips/math-emu/ieee754d.c 2003-07-13 23:37:57.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/math-emu/ieee754d.c 2003-07-16 16:27:35.000000000 -0400 @@ -61,39 +61,39 @@ { int i; - printk("%s", m); - printk("<%08x,%08x>\n", (unsigned) (x.bits >> 32), + printk(KERN_DEBUG "%s", m); + printk(KERN_DEBUG "<%08x,%08x>\n", (unsigned) (x.bits >> 32), (unsigned) x.bits); - printk("\t="); + printk(KERN_DEBUG "\t="); switch (ieee754dp_class(x)) { case IEEE754_CLASS_QNAN: case IEEE754_CLASS_SNAN: - printk("Nan %c", DPSIGN(x) ? '-' : '+'); + printk(KERN_DEBUG "Nan %c", DPSIGN(x) ? '-' : '+'); for (i = DP_FBITS - 1; i >= 0; i--) - printk("%c", DPMANT(x) & DP_MBIT(i) ? '1' : '0'); + printk(KERN_DEBUG "%c", DPMANT(x) & DP_MBIT(i) ? '1' : '0'); break; case IEEE754_CLASS_INF: - printk("%cInfinity", DPSIGN(x) ? '-' : '+'); + printk(KERN_DEBUG "%cInfinity", DPSIGN(x) ? '-' : '+'); break; case IEEE754_CLASS_ZERO: - printk("%cZero", DPSIGN(x) ? '-' : '+'); + printk(KERN_DEBUG "%cZero", DPSIGN(x) ? '-' : '+'); break; case IEEE754_CLASS_DNORM: - printk("%c0.", DPSIGN(x) ? '-' : '+'); + printk(KERN_DEBUG "%c0.", DPSIGN(x) ? '-' : '+'); for (i = DP_FBITS - 1; i >= 0; i--) - printk("%c", DPMANT(x) & DP_MBIT(i) ? '1' : '0'); - printk("e%d", DPBEXP(x) - DP_EBIAS); + printk(KERN_DEBUG "%c", DPMANT(x) & DP_MBIT(i) ? '1' : '0'); + printk(KERN_DEBUG "e%d", DPBEXP(x) - DP_EBIAS); break; case IEEE754_CLASS_NORM: - printk("%c1.", DPSIGN(x) ? '-' : '+'); + printk(KERN_DEBUG "%c1.", DPSIGN(x) ? '-' : '+'); for (i = DP_FBITS - 1; i >= 0; i--) - printk("%c", DPMANT(x) & DP_MBIT(i) ? '1' : '0'); - printk("e%d", DPBEXP(x) - DP_EBIAS); + printk(KERN_DEBUG "%c", DPMANT(x) & DP_MBIT(i) ? '1' : '0'); + printk(KERN_DEBUG "e%d", DPBEXP(x) - DP_EBIAS); break; default: - printk("Illegal/Unknown IEEE754 value class"); + printk(KERN_DEBUG "Illegal/Unknown IEEE754 value class"); } - printk("\n"); + printk(KERN_DEBUG "\n"); return x; } @@ -101,38 +101,38 @@ { int i; - printk("%s=", m); - printk("<%08x>\n", (unsigned) x.bits); - printk("\t="); + printk(KERN_DEBUG "%s=", m); + printk(KERN_DEBUG "<%08x>\n", (unsigned) x.bits); + printk(KERN_DEBUG "\t="); switch (ieee754sp_class(x)) { case IEEE754_CLASS_QNAN: case IEEE754_CLASS_SNAN: - printk("Nan %c", SPSIGN(x) ? '-' : '+'); + printk(KERN_DEBUG "Nan %c", SPSIGN(x) ? '-' : '+'); for (i = SP_FBITS - 1; i >= 0; i--) - printk("%c", SPMANT(x) & SP_MBIT(i) ? '1' : '0'); + printk(KERN_DEBUG "%c", SPMANT(x) & SP_MBIT(i) ? '1' : '0'); break; case IEEE754_CLASS_INF: - printk("%cInfinity", SPSIGN(x) ? '-' : '+'); + printk(KERN_DEBUG "%cInfinity", SPSIGN(x) ? '-' : '+'); break; case IEEE754_CLASS_ZERO: - printk("%cZero", SPSIGN(x) ? '-' : '+'); + printk(KERN_DEBUG "%cZero", SPSIGN(x) ? '-' : '+'); break; case IEEE754_CLASS_DNORM: - printk("%c0.", SPSIGN(x) ? '-' : '+'); + printk(KERN_DEBUG "%c0.", SPSIGN(x) ? '-' : '+'); for (i = SP_FBITS - 1; i >= 0; i--) - printk("%c", SPMANT(x) & SP_MBIT(i) ? '1' : '0'); - printk("e%d", SPBEXP(x) - SP_EBIAS); + printk(KERN_DEBUG "%c", SPMANT(x) & SP_MBIT(i) ? '1' : '0'); + printk(KERN_DEBUG "e%d", SPBEXP(x) - SP_EBIAS); break; case IEEE754_CLASS_NORM: - printk("%c1.", SPSIGN(x) ? '-' : '+'); + printk(KERN_DEBUG "%c1.", SPSIGN(x) ? '-' : '+'); for (i = SP_FBITS - 1; i >= 0; i--) - printk("%c", SPMANT(x) & SP_MBIT(i) ? '1' : '0'); - printk("e%d", SPBEXP(x) - SP_EBIAS); + printk(KERN_DEBUG "%c", SPMANT(x) & SP_MBIT(i) ? '1' : '0'); + printk(KERN_DEBUG "e%d", SPBEXP(x) - SP_EBIAS); break; default: - printk("Illegal/Unknown IEEE754 value class"); + printk(KERN_DEBUG "Illegal/Unknown IEEE754 value class"); } - printk("\n"); + printk(KERN_DEBUG "\n"); return x; } diff -urN linux-2.6.0-test1/arch/mips/math-emu/kernel_linkage.c linux-2.6.0-test1-printk-mips/arch/mips/math-emu/kernel_linkage.c --- linux-2.6.0-test1/arch/mips/math-emu/kernel_linkage.c 2003-07-13 23:29:30.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/math-emu/kernel_linkage.c 2003-07-16 16:24:45.000000000 -0400 @@ -42,7 +42,7 @@ if (first) { first = 0; - printk("Algorithmics/MIPS FPU Emulator v1.5\n"); + printk(KERN_INFO "Algorithmics/MIPS FPU Emulator v1.5\n"); } current->thread.fpu.soft.sr = 0; diff -urN linux-2.6.0-test1/arch/mips/mips-boards/atlas/atlas_setup.c linux-2.6.0-test1-printk-mips/arch/mips/mips-boards/atlas/atlas_setup.c --- linux-2.6.0-test1/arch/mips/mips-boards/atlas/atlas_setup.c 2003-07-13 23:34:41.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mips-boards/atlas/atlas_setup.c 2003-07-16 20:17:26.000000000 -0400 @@ -93,10 +93,10 @@ int line; argptr += strlen("kgdb=ttyS"); if (*argptr != '0' && *argptr != '1') - printk("KGDB: Uknown serial line /dev/ttyS%c, " + printk(KERN_WARNING "KGDB: Uknown serial line /dev/ttyS%c, " "falling back to /dev/ttyS1\n", *argptr); line = *argptr == '0' ? 0 : 1; - printk("KGDB: Using serial line /dev/ttyS%d for session\n", + printk(KERN_NOTICE "KGDB: Using serial line /dev/ttyS%d for session\n", line ? 1 : 0); if(line == 0) { diff -urN linux-2.6.0-test1/arch/mips/mips-boards/generic/init.c linux-2.6.0-test1-printk-mips/arch/mips/mips-boards/generic/init.c --- linux-2.6.0-test1/arch/mips/mips-boards/generic/init.c 2003-07-13 23:29:30.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mips-boards/generic/init.c 2003-07-16 20:15:46.000000000 -0400 @@ -102,17 +102,17 @@ ethaddr_str = prom_getenv("ethaddr"); if (!ethaddr_str) { - printk("ethaddr not set in boot prom\n"); + printk(KERN_WARNING "ethaddr not set in boot prom\n"); return -1; } str2eaddr(ethernet_addr, ethaddr_str); if (init_debug > 1) { int i; - printk("get_ethernet_addr: "); + printk(KERN_DEBUG "get_ethernet_addr: "); for (i=0; i<5; i++) - printk("%02x:", (unsigned char)*(ethernet_addr+i)); - printk("%02x\n", *(ethernet_addr+i)); + printk(KERN_DEBUG "%02x:", (unsigned char)*(ethernet_addr+i)); + printk(KERN_DEBUG "%02x\n", *(ethernet_addr+i)); } return 0; diff -urN linux-2.6.0-test1/arch/mips/mips-boards/generic/memory.c linux-2.6.0-test1-printk-mips/arch/mips/mips-boards/generic/memory.c --- linux-2.6.0-test1/arch/mips/mips-boards/generic/memory.c 2003-07-13 23:30:43.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mips-boards/generic/memory.c 2003-07-16 20:16:12.000000000 -0400 @@ -168,5 +168,5 @@ freed += PAGE_SIZE; } } - printk("Freeing prom memory: %ldkb freed\n", freed >> 10); + printk(KERN_INFO "Freeing prom memory: %ldkb freed\n", freed >> 10); } diff -urN linux-2.6.0-test1/arch/mips/mips-boards/generic/time.c linux-2.6.0-test1-printk-mips/arch/mips/mips-boards/generic/time.c --- linux-2.6.0-test1/arch/mips/mips-boards/generic/time.c 2003-07-13 23:35:52.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mips-boards/generic/time.c 2003-07-16 20:16:41.000000000 -0400 @@ -154,9 +154,9 @@ /* Set Data mode - binary. */ CMOS_WRITE(CMOS_READ(RTC_CONTROL) | RTC_DM_BINARY, RTC_CONTROL); - printk("calculating r4koff... "); + printk(KERN_INFO "calculating r4koff... "); r4k_offset = cal_r4koff(); - printk("%08x(%d)\n", r4k_offset, r4k_offset); + printk(KERN_INFO "%08x(%d)\n", r4k_offset, r4k_offset); if ((read_c0_prid() & 0xffff00) == (PRID_COMP_MIPS | PRID_IMP_20KC)) @@ -166,7 +166,7 @@ est_freq += 5000; /* round */ est_freq -= est_freq%10000; - printk("CPU frequency %d.%02d MHz\n", est_freq/1000000, + printk(KERN_INFO "CPU frequency %d.%02d MHz\n", est_freq/1000000, (est_freq%1000000)*100/1000000); local_irq_restore(flags); diff -urN linux-2.6.0-test1/arch/mips/mips-boards/malta/malta_int.c linux-2.6.0-test1-printk-mips/arch/mips/mips-boards/malta/malta_int.c --- linux-2.6.0-test1/arch/mips/mips-boards/malta/malta_int.c 2003-07-13 23:32:01.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mips-boards/malta/malta_int.c 2003-07-16 20:12:16.000000000 -0400 @@ -71,7 +71,7 @@ PIIX4_ICTLR1_OCW3); if (!(inb(PIIX4_ICTLR1_OCW3) & (1 << 7))) { spin_unlock_irqrestore(&mips_irq_lock, flags); - printk("We got a spurious interrupt from PIIX4.\n"); + printk(KERN_NOTICE "We got a spurious interrupt from PIIX4.\n"); atomic_inc(&irq_err_count); return -1; /* Spurious interrupt. */ } @@ -99,8 +99,8 @@ /* Mask out corehi interrupt. */ clear_c0_status(IE_IRQ3); - printk("CoreHI interrupt, shouldn't happen, so we die here!!!\n"); - printk("epc : %08lx\nStatus: %08lx\nCause : %08lx\nbadVaddr : %08lx\n" + printk(KERN_EMERG "CoreHI interrupt, shouldn't happen, so we die here!!!\n"); + printk(KERN_EMERG "epc : %08lx\nStatus: %08lx\nCause : %08lx\nbadVaddr : %08lx\n" , regs->cp0_epc, regs->cp0_status, regs->cp0_cause, regs->cp0_badvaddr); switch(mips_revision_corid) { case MIPS_REVISION_CORID_CORE_MSC: @@ -109,25 +109,25 @@ case MIPS_REVISION_CORID_CORE_LV: case MIPS_REVISION_CORID_CORE_FPGA: GT_READ(GT_INTRCAUSE_OFS, data); - printk("GT_INTRCAUSE = %08x\n", data); + printk(KERN_EMERG "GT_INTRCAUSE = %08x\n", data); GT_READ(0x70, data); GT_READ(0x78, datahi); - printk("GT_CPU_ERR_ADDR = %0x2%08x\n", datahi,data); + printk(KERN_EMERG "GT_CPU_ERR_ADDR = %0x2%08x\n", datahi,data); break; case MIPS_REVISION_CORID_BONITO64: case MIPS_REVISION_CORID_CORE_20K: data = BONITO_INTISR; - printk("BONITO_INTISR = %08x\n", data); + printk(KERN_EMERG "BONITO_INTISR = %08x\n", data); data = BONITO_INTEN; - printk("BONITO_INTEN = %08x\n", data); + printk(KERN_EMERG "BONITO_INTEN = %08x\n", data); data = BONITO_INTPOL; - printk("BONITO_INTPOL = %08x\n", data); + printk(KERN_EMERG "BONITO_INTPOL = %08x\n", data); data = BONITO_INTEDGE; - printk("BONITO_INTEDGE = %08x\n", data); + printk(KERN_EMERG "BONITO_INTEDGE = %08x\n", data); data = BONITO_INTSTEER; - printk("BONITO_INTSTEER = %08x\n", data); + printk(KERN_EMERG "BONITO_INTSTEER = %08x\n", data); data = BONITO_PCICMD; - printk("BONITO_PCICMD = %08x\n", data); + printk(KERN_EMERG "BONITO_PCICMD = %08x\n", data); break; } diff -urN linux-2.6.0-test1/arch/mips/mips-boards/malta/malta_setup.c linux-2.6.0-test1-printk-mips/arch/mips/mips-boards/malta/malta_setup.c --- linux-2.6.0-test1/arch/mips/mips-boards/malta/malta_setup.c 2003-07-13 23:39:33.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mips-boards/malta/malta_setup.c 2003-07-16 20:12:57.000000000 -0400 @@ -111,10 +111,10 @@ int line; argptr += strlen("kgdb=ttyS"); if (*argptr != '0' && *argptr != '1') - printk("KGDB: Uknown serial line /dev/ttyS%c, " + printk(KERN_WARNING "KGDB: Uknown serial line /dev/ttyS%c, " "falling back to /dev/ttyS1\n", *argptr); line = *argptr == '0' ? 0 : 1; - printk("KGDB: Using serial line /dev/ttyS%d for session\n", + printk(KERN_NOTICE "KGDB: Using serial line /dev/ttyS%d for session\n", line ? 1 : 0); rs_kgdb_hook(line); diff -urN linux-2.6.0-test1/arch/mips/mips-boards/sead/sead_time.c linux-2.6.0-test1-printk-mips/arch/mips/mips-boards/sead/sead_time.c --- linux-2.6.0-test1/arch/mips/mips-boards/sead/sead_time.c 2003-07-13 23:33:41.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mips-boards/sead/sead_time.c 2003-07-16 20:14:01.000000000 -0400 @@ -111,9 +111,9 @@ /* Start r4k counter. */ write_c0_count(0); - printk("calculating r4koff... "); + printk(KERN_INFO "calculating r4koff... "); r4k_offset = cal_r4koff(); - printk("%08lx(%d)\n", r4k_offset, (int) r4k_offset); + printk(KERN_INFO "%08lx(%d)\n", r4k_offset, (int) r4k_offset); if ((read_c0_prid() & 0xffff00) == (PRID_COMP_MIPS | PRID_IMP_20KC)) @@ -123,7 +123,7 @@ est_freq += 5000; /* round */ est_freq -= est_freq%10000; - printk("CPU frequency %d.%02d MHz\n", est_freq/1000000, + printk(KERN_INFO "CPU frequency %d.%02d MHz\n", est_freq/1000000, (est_freq%1000000)*100/1000000); local_irq_restore(flags); diff -urN linux-2.6.0-test1/arch/mips/mm/c-r3k.c linux-2.6.0-test1-printk-mips/arch/mips/mm/c-r3k.c --- linux-2.6.0-test1/arch/mips/mm/c-r3k.c 2003-07-13 23:37:13.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mm/c-r3k.c 2003-07-16 15:43:47.000000000 -0400 @@ -277,7 +277,7 @@ return; #ifdef DEBUG_CACHE - printk("cpage[%d,%08lx]", cpu_context(smp_processor_id(), mm), page); + printk(KERN_DEBUG "cpage[%d,%08lx]", cpu_context(smp_processor_id(), mm), page); #endif physpage = (unsigned long) page_address(page); @@ -290,7 +290,7 @@ unsigned long flags; #ifdef DEBUG_CACHE - printk("csigtramp[%08lx]", addr); + printk(KERN_DEBUG "csigtramp[%08lx]", addr); #endif flags = read_c0_status(); @@ -337,8 +337,8 @@ _dma_cache_wback_inv = r3k_dma_cache_wback_inv; - printk("Primary instruction cache %ldkB, linesize %ld bytes.\n", + printk(KERN_INFO "Primary instruction cache %ldkB, linesize %ld bytes.\n", icache_size >> 10, icache_lsize); - printk("Primary data cache %ldkB, linesize %ld bytes.\n", + printk(KERN_INFO "Primary data cache %ldkB, linesize %ld bytes.\n", dcache_size >> 10, dcache_lsize); } diff -urN linux-2.6.0-test1/arch/mips/mm/c-r4k.c linux-2.6.0-test1-printk-mips/arch/mips/mm/c-r4k.c --- linux-2.6.0-test1/arch/mips/mm/c-r4k.c 2003-07-13 23:38:37.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mm/c-r4k.c 2003-07-16 15:44:54.000000000 -0400 @@ -880,12 +880,12 @@ break; } - printk("Primary instruction cache %ldkB, %s, %s, linesize %d bytes.\n", + printk(KERN_INFO "Primary instruction cache %ldkB, %s, %s, linesize %d bytes.\n", icache_size >> 10, cpu_has_vtag_icache ? "virtually tagged" : "physically tagged", way_string[c->icache.ways], c->icache.linesz); - printk("Primary data cache %ldkB %s, linesize %d bytes.\n", + printk(KERN_INFO "Primary data cache %ldkB %s, linesize %d bytes.\n", dcache_size >> 10, way_string[c->dcache.ways], c->dcache.linesz); } @@ -1083,7 +1083,7 @@ !(current_cpu_data.scache.flags & MIPS_CACHE_NOT_PRESENT)) panic("Dunno how to handle MIPS32 / MIPS64 second level cache"); - printk("Unified secondary cache %ldkB %s, linesize %d bytes.\n", + printk(KERN_INFO "Unified secondary cache %ldkB %s, linesize %d bytes.\n", scache_size >> 10, way_string[c->scache.ways], c->scache.linesz); current_cpu_data.options |= MIPS_CPU_SUBSET_CACHES; diff -urN linux-2.6.0-test1/arch/mips/mm/c-tx39.c linux-2.6.0-test1-printk-mips/arch/mips/mm/c-tx39.c --- linux-2.6.0-test1/arch/mips/mm/c-tx39.c 2003-07-13 23:39:32.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mm/c-tx39.c 2003-07-16 15:56:14.000000000 -0400 @@ -488,8 +488,8 @@ current_cpu_data.icache.waybit = 0; current_cpu_data.dcache.waybit = 0; - printk("Primary instruction cache %ldkb, linesize %d bytes\n", + printk(KERN_INFO "Primary instruction cache %ldkb, linesize %d bytes\n", icache_size >> 10, current_cpu_data.icache.linesz); - printk("Primary data cache %ldkb, linesize %d bytes\n", + printk(KERN_INFO "Primary data cache %ldkb, linesize %d bytes\n", dcache_size >> 10, current_cpu_data.dcache.linesz); } diff -urN linux-2.6.0-test1/arch/mips/mm/fault.c linux-2.6.0-test1-printk-mips/arch/mips/mm/fault.c --- linux-2.6.0-test1/arch/mips/mm/fault.c 2003-07-13 23:32:29.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mm/fault.c 2003-07-16 15:41:03.000000000 -0400 @@ -58,7 +58,7 @@ * a poke. Hold onto your hats... */ console_loglevel = 15; /* NMI oopser may have shut the console up */ - printk(" "); + printk(KERN_WARNING " "); console_loglevel = loglevel_save; } @@ -77,7 +77,7 @@ siginfo_t info; #if 0 - printk("Cpu%d[%s:%d:%08lx:%ld:%08lx]\n", smp_processor_id(), + printk(KERN_NOTICE "Cpu%d[%s:%d:%08lx:%ld:%08lx]\n", smp_processor_id(), current->comm, current->pid, address, write, regs->cp0_epc); #endif @@ -162,7 +162,7 @@ tsk->thread.cp0_badvaddr = address; tsk->thread.error_code = write; #if 0 - printk("do_page_fault() #2: sending SIGSEGV to %s for illegal %s\n" + printk(KERN_NOTICE "do_page_fault() #2: sending SIGSEGV to %s for illegal %s\n" "%08lx (epc == %08lx, ra == %08lx)\n", tsk->comm, write ? "write access to" : "read access from", @@ -215,7 +215,7 @@ down_read(&mm->mmap_sem); goto survive; } - printk("VM: killing process %s\n", tsk->comm); + printk(KERN_WARNING "VM: killing process %s\n", tsk->comm); if (user_mode(regs)) do_exit(SIGKILL); goto no_context; diff -urN linux-2.6.0-test1/arch/mips/mm/ioremap.c linux-2.6.0-test1-printk-mips/arch/mips/mm/ioremap.c --- linux-2.6.0-test1/arch/mips/mm/ioremap.c 2003-07-13 23:34:03.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mm/ioremap.c 2003-07-16 15:42:39.000000000 -0400 @@ -33,7 +33,7 @@ pfn = phys_addr >> PAGE_SHIFT; do { if (!pte_none(*pte)) { - printk("remap_area_pte: page already exists\n"); + printk(KERN_CRIT "remap_area_pte: page already exists\n"); BUG(); } set_pte(pte, pfn_pte(pfn, pgprot)); diff -urN linux-2.6.0-test1/arch/mips/mm/pgtable.c linux-2.6.0-test1-printk-mips/arch/mips/mm/pgtable.c --- linux-2.6.0-test1/arch/mips/mm/pgtable.c 2003-07-13 23:32:44.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mm/pgtable.c 2003-07-16 15:41:56.000000000 -0400 @@ -9,9 +9,9 @@ int highmem = 0; struct page *page; - printk("Mem-info:\n"); + printk(KERN_INFO "Mem-info:\n"); show_free_areas(); - printk("Free swap: %6dkB\n",nr_swap_pages<<(PAGE_SHIFT-10)); + printk(KERN_INFO "Free swap: %6dkB\n",nr_swap_pages<<(PAGE_SHIFT-10)); pfn = max_mapnr; while (pfn-- > 0) { page = pfn_to_page(pfn); @@ -25,9 +25,9 @@ else if (page_count(page)) shared += page_count(page) - 1; } - printk("%d pages of RAM\n", total); - printk("%d pages of HIGHMEM\n",highmem); - printk("%d reserved pages\n",reserved); - printk("%d pages shared\n",shared); - printk("%d pages swap cached\n",cached); + printk(KERN_INFO "%d pages of RAM\n", total); + printk(KERN_INFO "%d pages of HIGHMEM\n",highmem); + printk(KERN_INFO "%d reserved pages\n",reserved); + printk(KERN_INFO "%d pages shared\n",shared); + printk(KERN_INFO "%d pages swap cached\n",cached); } diff -urN linux-2.6.0-test1/arch/mips/mm/sc-ip22.c linux-2.6.0-test1-printk-mips/arch/mips/mm/sc-ip22.c --- linux-2.6.0-test1/arch/mips/mm/sc-ip22.c 2003-07-13 23:35:16.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mm/sc-ip22.c 2003-07-16 15:43:17.000000000 -0400 @@ -62,7 +62,7 @@ unsigned int flags; #ifdef DEBUG_CACHE - printk("indy_sc_wback_invalidate[%08lx,%08lx]", addr, size); + printk(KERN_DEBUG "indy_sc_wback_invalidate[%08lx,%08lx]", addr, size); #endif if (!size) @@ -90,7 +90,7 @@ /* This is really cool... */ #ifdef DEBUG_CACHE - printk("Enabling R4600 SCACHE\n"); + printk(KERN_DEBUG "Enabling R4600 SCACHE\n"); #endif __asm__ __volatile__( ".set\tpush\n\t" @@ -120,7 +120,7 @@ unsigned long tmp1, tmp2, tmp3; #ifdef DEBUG_CACHE - printk("Disabling R4600 SCACHE\n"); + printk(KERN_DEBUG "Disabling R4600 SCACHE\n"); #endif __asm__ __volatile__( ".set\tpush\n\t" diff -urN linux-2.6.0-test1/arch/mips/mm/sc-r5k.c linux-2.6.0-test1-printk-mips/arch/mips/mm/sc-r5k.c --- linux-2.6.0-test1/arch/mips/mm/sc-r5k.c 2003-07-13 23:34:40.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mm/sc-r5k.c 2003-07-16 15:42:56.000000000 -0400 @@ -93,7 +93,7 @@ scache_size = (512 * 1024) << ((config & R5K_CONF_SS) >> 20); - printk("R5000 SCACHE size %ldkB, linesize 32 bytes.\n", + printk(KERN_INFO "R5000 SCACHE size %ldkB, linesize 32 bytes.\n", scache_size >> 10); return 1; diff -urN linux-2.6.0-test1/arch/mips/mm/sc-rm7k.c linux-2.6.0-test1-printk-mips/arch/mips/mm/sc-rm7k.c --- linux-2.6.0-test1/arch/mips/mm/sc-rm7k.c 2003-07-13 23:28:53.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mm/sc-rm7k.c 2003-07-16 15:36:27.000000000 -0400 @@ -35,7 +35,7 @@ unsigned long end, a; #ifdef DEBUG_CACHE - printk("rm7k_sc_wback_inv[%08lx,%08lx]", addr, size); + printk(KERN_DEBUG "rm7k_sc_wback_inv[%08lx,%08lx]", addr, size); #endif a = addr & ~(sc_lsize - 1); @@ -65,7 +65,7 @@ unsigned long end, a; #ifdef DEBUG_CACHE - printk("rm7k_sc_inv[%08lx,%08lx]", addr, size); + printk(KERN_DEBUG "rm7k_sc_inv[%08lx,%08lx]", addr, size); #endif a = addr & ~(sc_lsize - 1); @@ -148,7 +148,7 @@ printk(KERN_INFO "Enabling secondary cache..."); func(); - printk(" done\n"); + printk(KERN_INFO " done\n"); /* * While we're at it let's deal with the tertiary cache. diff -urN linux-2.6.0-test1/arch/mips/mm/tlb-r3k.c linux-2.6.0-test1-printk-mips/arch/mips/mm/tlb-r3k.c --- linux-2.6.0-test1/arch/mips/mm/tlb-r3k.c 2003-07-13 23:38:47.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mm/tlb-r3k.c 2003-07-16 15:45:48.000000000 -0400 @@ -47,7 +47,7 @@ int entry; #ifdef DEBUG_TLB - printk("[tlball]"); + printk(KERN_DEBUG "[tlball]"); #endif local_irq_save(flags); @@ -70,7 +70,7 @@ if (cpu_context(cpu, mm) != 0) { #ifdef DEBUG_TLB - printk("[tlbmm<%lu>]", (unsigned long)cpu_context(cpu, mm)); + printk(KERN_DEBUG "[tlbmm<%lu>]", (unsigned long)cpu_context(cpu, mm)); #endif drop_mmu_context(mm, cpu); } @@ -87,7 +87,7 @@ int size; #ifdef DEBUG_TLB - printk("[tlbrange<%lu,0x%08lx,0x%08lx>]", + printk(KERN_DEBUG "[tlbrange<%lu,0x%08lx,0x%08lx>]", cpu_context(cpu, mm) & ASID_MASK, start, end); #endif local_irq_save(flags); @@ -126,7 +126,7 @@ int size; #ifdef DEBUG_TLB - printk("[tlbrange<%lu,0x%08lx,0x%08lx>]", start, end); + printk(KERN_DEBUG "[tlbrange<%lu,0x%08lx,0x%08lx>]", start, end); #endif local_irq_save(flags); size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT; @@ -166,7 +166,7 @@ int oldpid, newpid, idx; #ifdef DEBUG_TLB - printk("[tlbpage<%lu,0x%08lx>]", cpu_context(cpu, vma->vm_mm), page); + printk(KERN_DEBUG "[tlbpage<%lu,0x%08lx>]", cpu_context(cpu, vma->vm_mm), page); #endif newpid = cpu_context(cpu, vma->vm_mm) & ASID_MASK; page &= PAGE_MASK; @@ -203,7 +203,7 @@ #ifdef DEBUG_TLB if ((pid != (cpu_context(cpu, vma->vm_mm) & ASID_MASK)) || (cpu_context(cpu, vma->vm_mm) == 0)) { - printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%lu tlbpid=%d\n", + printk(KERN_DEBUG "update_mmu_cache: Wheee, bogus tlbpid mmpid=%lu tlbpid=%d\n", (cpu_context(cpu, vma->vm_mm)), pid); } #endif @@ -237,7 +237,7 @@ unsigned long w; #ifdef DEBUG_TLB - printk("[tlbwired]\n", + printk(KERN_DEBUG "[tlbwired]\n", entrylo0, entryhi, pagemask); #endif @@ -248,7 +248,7 @@ w = read_c0_wired(); write_c0_wired(w + 1); if (read_c0_wired() != w + 1) { - printk("[tlbwired] No WIRED reg?\n"); + printk(KERN_WARNING "[tlbwired] No WIRED reg?\n"); return; } write_c0_index(w << 8); @@ -265,7 +265,7 @@ } else if (wired < 8) { #ifdef DEBUG_TLB - printk("[tlbwired]\n", + printk(KERN_DEBUG "[tlbwired]\n", entrylo0, entryhi); #endif diff -urN linux-2.6.0-test1/arch/mips/mm/tlb-r4k.c linux-2.6.0-test1-printk-mips/arch/mips/mm/tlb-r4k.c --- linux-2.6.0-test1/arch/mips/mm/tlb-r4k.c 2003-07-13 23:32:28.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mm/tlb-r4k.c 2003-07-16 15:37:04.000000000 -0400 @@ -41,7 +41,7 @@ int entry; #ifdef DEBUG_TLB - printk("[tlball]"); + printk(KERN_DEBUG "[tlball]"); #endif local_irq_save(flags); @@ -77,7 +77,7 @@ if (cpu_context(cpu, mm) != 0) { #ifdef DEBUG_TLB - printk("[tlbmm<%d>]", cpu_context(cpu, mm)); + printk(KERN_DEBUG "[tlbmm<%d>]", cpu_context(cpu, mm)); #endif drop_mmu_context(mm,cpu); } @@ -94,7 +94,7 @@ int size; #ifdef DEBUG_TLB - printk("[tlbrange<%02x,%08lx,%08lx>]", cpu_context(cpu, mm) & ASID_MASK, + printk(KERN_DEBUG "[tlbrange<%02x,%08lx,%08lx>]", cpu_context(cpu, mm) & ASID_MASK, start, end); #endif local_irq_save(flags); @@ -140,7 +140,7 @@ int size; #ifdef DEBUG_TLB - printk("[tlbkernelrange<%02x,%08lx,%08lx>]", start, end); + printk(KERN_DEBUG "[tlbkernelrange<%02x,%08lx,%08lx>]", start, end); #endif local_irq_save(flags); size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT; @@ -187,7 +187,7 @@ int oldpid, newpid, idx; #ifdef DEBUG_TLB - printk("[tlbpage<%d,%08lx>]", cpu_context(cpu, vma->vm_mm), + printk(KERN_DEBUG "[tlbpage<%d,%08lx>]", cpu_context(cpu, vma->vm_mm), page); #endif newpid = (cpu_context(cpu, vma->vm_mm) & ASID_MASK); @@ -269,7 +269,7 @@ #ifdef DEBUG_TLB if ((pid != cpu_context(cpu, vma->vm_mm) & ASID_MASK) || (cpu_context(vma->vm_mm) == 0)) { - printk("update_mmu_cache: Wheee, bogus tlbpid mmpid=%d " + printk(KERN_DEBUG "update_mmu_cache: Wheee, bogus tlbpid mmpid=%d " "tlbpid=%d\n", (int) (cpu_context(cpu, vma->vm_mm) & ASID_MASK), pid); } diff -urN linux-2.6.0-test1/arch/mips/mm/tlb-sb1.c linux-2.6.0-test1-printk-mips/arch/mips/mm/tlb-sb1.c --- linux-2.6.0-test1/arch/mips/mm/tlb-sb1.c 2003-07-13 23:39:26.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/mm/tlb-sb1.c 2003-07-16 15:55:45.000000000 -0400 @@ -51,7 +51,7 @@ "=r" (entrylo1hi), "=r" (entrylo1lo), "=r" (pagemask)); - printk("%08X%08X %08X%08X %08X%08X %08X", + printk(KERN_ALERT "%08X%08X %08X%08X %08X%08X %08X", entryhihi, entryhilo, entrylo0hi, entrylo0lo, entrylo1hi, entrylo1lo, @@ -65,21 +65,21 @@ int entry; local_irq_save(flags); old_ctx = read_c0_entryhi(); - printk("Current TLB registers state:\n" + printk(KERN_ALERT "Current TLB registers state:\n" " EntryHi EntryLo0 EntryLo1 PageMask Index\n" "--------------------------------------------------------------------\n"); dump_cur_tlb_regs(); - printk(" %08X\n", read_c0_index()); - printk("\n\nFull TLB Dump:\n" + printk(KERN_ALERT " %08X\n", read_c0_index()); + printk(KERN_ALERT "\n\nFull TLB Dump:\n" "Idx EntryHi EntryLo0 EntryLo1 PageMask\n" "--------------------------------------------------------------\n"); for (entry = 0; entry < current_cpu_data.tlbsize; entry++) { write_c0_index(entry); - printk("\n%02i ", entry); + printk(KERN_ALERT "\n%02i ", entry); tlb_read(); dump_cur_tlb_regs(); } - printk("\n"); + printk(KERN_ALERT "\n"); write_c0_entryhi(old_ctx); local_irq_restore(flags); } diff -urN linux-2.6.0-test1/arch/mips/momentum/ocelot_c/irq.c linux-2.6.0-test1-printk-mips/arch/mips/momentum/ocelot_c/irq.c --- linux-2.6.0-test1/arch/mips/momentum/ocelot_c/irq.c 2003-07-13 23:37:22.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/momentum/ocelot_c/irq.c 2003-07-16 19:54:37.000000000 -0400 @@ -172,7 +172,7 @@ cpci_irq_init(); #ifdef CONFIG_KGDB - printk("start kgdb ...\n"); + printk(KERN_INFO "start kgdb ...\n"); set_debug_traps(); breakpoint(); /* you may move this line to whereever you want :-) */ #endif diff -urN linux-2.6.0-test1/arch/mips/momentum/ocelot_c/setup.c linux-2.6.0-test1-printk-mips/arch/mips/momentum/ocelot_c/setup.c --- linux-2.6.0-test1/arch/mips/momentum/ocelot_c/setup.c 2003-07-13 23:31:22.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/momentum/ocelot_c/setup.c 2003-07-16 19:54:14.000000000 -0400 @@ -234,58 +234,58 @@ tmpword = OCELOT_FPGA_READ(BOARDREV); #ifdef CONFIG_CPU_SR71000 if (tmpword < 26) - printk("Momenco Ocelot-CS: Board Assembly Rev. %c\n", + printk(KERN_INFO "Momenco Ocelot-CS: Board Assembly Rev. %c\n", 'A'+tmpword); else - printk("Momenco Ocelot-CS: Board Assembly Revision #0x%x\n", + printk(KERN_INFO "Momenco Ocelot-CS: Board Assembly Revision #0x%x\n", tmpword); #else if (tmpword < 26) - printk("Momenco Ocelot-C: Board Assembly Rev. %c\n", + printk(KERN_INFO "Momenco Ocelot-C: Board Assembly Rev. %c\n", 'A'+tmpword); else - printk("Momenco Ocelot-C: Board Assembly Revision #0x%x\n", + printk(KERN_INFO "Momenco Ocelot-C: Board Assembly Revision #0x%x\n", tmpword); #endif tmpword = OCELOT_FPGA_READ(FPGA_REV); - printk("FPGA Rev: %d.%d\n", tmpword>>4, tmpword&15); + printk(KERN_INFO "FPGA Rev: %d.%d\n", tmpword>>4, tmpword&15); tmpword = OCELOT_FPGA_READ(RESET_STATUS); - printk("Reset reason: 0x%x\n", tmpword); + printk(KERN_INFO "Reset reason: 0x%x\n", tmpword); switch (tmpword) { case 0x1: - printk(" - Power-up reset\n"); + printk(KERN_INFO " - Power-up reset\n"); break; case 0x2: - printk(" - Push-button reset\n"); + printk(KERN_INFO " - Push-button reset\n"); break; case 0x4: - printk(" - cPCI bus reset\n"); + printk(KERN_INFO " - cPCI bus reset\n"); break; case 0x8: - printk(" - Watchdog reset\n"); + printk(KERN_INFO " - Watchdog reset\n"); break; case 0x10: - printk(" - Software reset\n"); + printk(KERN_INFO " - Software reset\n"); break; default: - printk(" - Unknown reset cause\n"); + printk(KERN_INFO " - Unknown reset cause\n"); } reset_reason = tmpword; OCELOT_FPGA_WRITE(0xff, RESET_STATUS); tmpword = OCELOT_FPGA_READ(CPCI_ID); - printk("cPCI ID register: 0x%02x\n", tmpword); - printk(" - Slot number: %d\n", tmpword & 0x1f); - printk(" - PCI bus present: %s\n", tmpword & 0x40 ? "yes" : "no"); - printk(" - System Slot: %s\n", tmpword & 0x20 ? "yes" : "no"); + printk(KERN_INFO "cPCI ID register: 0x%02x\n", tmpword); + printk(KERN_INFO " - Slot number: %d\n", tmpword & 0x1f); + printk(KERN_INFO " - PCI bus present: %s\n", tmpword & 0x40 ? "yes" : "no"); + printk(KERN_INFO " - System Slot: %s\n", tmpword & 0x20 ? "yes" : "no"); tmpword = OCELOT_FPGA_READ(BOARD_STATUS); - printk("Board Status register: 0x%02x\n", tmpword); - printk(" - User jumper: %s\n", (tmpword & 0x80)?"installed":"absent"); - printk(" - Boot flash write jumper: %s\n", (tmpword&0x40)?"installed":"absent"); - printk(" - L3 Cache size: %d MiB\n", (1<<((tmpword&12) >> 2))&~1); - printk(" - SDRAM size: %d MiB\n", 1<<(6+(tmpword&3))); + printk(KERN_INFO "Board Status register: 0x%02x\n", tmpword); + printk(KERN_INFO " - User jumper: %s\n", (tmpword & 0x80)?"installed":"absent"); + printk(KERN_INFO " - Boot flash write jumper: %s\n", (tmpword&0x40)?"installed":"absent"); + printk(KERN_INFO " - L3 Cache size: %d MiB\n", (1<<((tmpword&12) >> 2))&~1); + printk(KERN_INFO " - SDRAM size: %d MiB\n", 1<<(6+(tmpword&3))); switch(tmpword &3) { case 3: @@ -317,7 +317,7 @@ if (!io_remap_range) { panic("Could not ioremap I/O port range"); } - printk("io_remap_range set at 0x%08x\n", (uint32_t)io_remap_range); + printk(KERN_NOTICE "io_remap_range set at 0x%08x\n", (uint32_t)io_remap_range); set_io_port_base(io_remap_range - 0xc0000000); return 0; diff -urN linux-2.6.0-test1/arch/mips/momentum/ocelot_g/gt-irq.c linux-2.6.0-test1-printk-mips/arch/mips/momentum/ocelot_g/gt-irq.c --- linux-2.6.0-test1/arch/mips/momentum/ocelot_g/gt-irq.c 2003-07-13 23:30:43.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/momentum/ocelot_g/gt-irq.c 2003-07-16 19:49:12.000000000 -0400 @@ -221,7 +221,7 @@ */ if (handled == 0) { if (counter < 50) { - printk("Spurious Galileo interrupt...\n"); + printk(KERN_NOTICE "Spurious Galileo interrupt...\n"); counter++; } } diff -urN linux-2.6.0-test1/arch/mips/momentum/ocelot_g/irq.c linux-2.6.0-test1-printk-mips/arch/mips/momentum/ocelot_g/irq.c --- linux-2.6.0-test1/arch/mips/momentum/ocelot_g/irq.c 2003-07-13 23:32:32.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/momentum/ocelot_g/irq.c 2003-07-16 19:49:49.000000000 -0400 @@ -162,7 +162,7 @@ gt64240_irq_init(); #ifdef CONFIG_KGDB - printk("start kgdb ...\n"); + printk(KERN_INFO "start kgdb ...\n"); set_debug_traps(); breakpoint(); /* you may move this line to whereever you want :-) */ #endif diff -urN linux-2.6.0-test1/arch/mips/momentum/ocelot_g/setup.c linux-2.6.0-test1-printk-mips/arch/mips/momentum/ocelot_g/setup.c --- linux-2.6.0-test1/arch/mips/momentum/ocelot_g/setup.c 2003-07-13 23:32:32.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/momentum/ocelot_g/setup.c 2003-07-16 19:52:22.000000000 -0400 @@ -151,26 +151,26 @@ tmpword = OCELOT_PLD_READ(BOARDREV); if (tmpword < 26) - printk("Momenco Ocelot-G: Board Assembly Rev. %c\n", 'A'+tmpword); + printk(KERN_INFO "Momenco Ocelot-G: Board Assembly Rev. %c\n", 'A'+tmpword); else - printk("Momenco Ocelot-G: Board Assembly Revision #0x%x\n", tmpword); + printk(KERN_INFO "Momenco Ocelot-G: Board Assembly Revision #0x%x\n", tmpword); tmpword = OCELOT_PLD_READ(PLD1_ID); - printk("PLD 1 ID: %d.%d\n", tmpword>>4, tmpword&15); + printk(KERN_INFO "PLD 1 ID: %d.%d\n", tmpword>>4, tmpword&15); tmpword = OCELOT_PLD_READ(PLD2_ID); - printk("PLD 2 ID: %d.%d\n", tmpword>>4, tmpword&15); + printk(KERN_INFO "PLD 2 ID: %d.%d\n", tmpword>>4, tmpword&15); tmpword = OCELOT_PLD_READ(RESET_STATUS); - printk("Reset reason: 0x%x\n", tmpword); + printk(KERN_INFO "Reset reason: 0x%x\n", tmpword); reset_reason = tmpword; OCELOT_PLD_WRITE(0xff, RESET_STATUS); tmpword = OCELOT_PLD_READ(BOARD_STATUS); - printk("Board Status register: 0x%02x\n", tmpword); - printk(" - User jumper: %s\n", (tmpword & 0x80)?"installed":"absent"); - printk(" - Boot flash write jumper: %s\n", (tmpword&0x40)?"installed":"absent"); - printk(" - Tulip PHY %s connected\n", (tmpword&0x10)?"is":"not"); - printk(" - L3 Cache size: %d MiB\n", (1<<((tmpword&12) >> 2))&~1); - printk(" - SDRAM size: %d MiB\n", 1<<(6+(tmpword&3))); + printk(KERN_INFO "Board Status register: 0x%02x\n", tmpword); + printk(KERN_INFO " - User jumper: %s\n", (tmpword & 0x80)?"installed":"absent"); + printk(KERN_INFO " - Boot flash write jumper: %s\n", (tmpword&0x40)?"installed":"absent"); + printk(KERN_INFO " - Tulip PHY %s connected\n", (tmpword&0x10)?"is":"not"); + printk(KERN_INFO " - L3 Cache size: %d MiB\n", (1<<((tmpword&12) >> 2))&~1); + printk(KERN_INFO " - SDRAM size: %d MiB\n", 1<<(6+(tmpword&3))); if (tmpword&12) l3func((1<<(((tmpword&12) >> 2)+20))); @@ -213,7 +213,7 @@ int register i; unsigned long tmp; - printk("Enabling L3 cache..."); + printk(KERN_INFO "Enabling L3 cache..."); /* Enable the L3 cache in the GT64120A's CPU Configuration register */ GT_READ(0, &tmp); @@ -241,7 +241,7 @@ /* Let the RM7000 MM code know that the tertiary cache is enabled */ rm7k_tcache_enabled = 1; - printk("Done\n"); + printk(KERN_INFO "Done\n"); } @@ -256,7 +256,7 @@ if (!io_remap_range) { panic("Could not ioremap I/O port range"); } - printk("io_remap_range set at 0x%08x\n", (uint32_t)io_remap_range); + printk(KERN_NOTICE "io_remap_range set at 0x%08x\n", (uint32_t)io_remap_range); set_io_port_base(io_remap_range - 0xc0000000); return 0; diff -urN linux-2.6.0-test1/arch/mips/pci/common.c linux-2.6.0-test1-printk-mips/arch/mips/pci/common.c --- linux-2.6.0-test1/arch/mips/pci/common.c 2003-07-13 23:34:41.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/common.c 2003-07-16 16:16:44.000000000 -0400 @@ -31,7 +31,7 @@ if (dev->resource[PCI_ROM_RESOURCE].start) cmd |= PCI_COMMAND_MEMORY; if (cmd != old_cmd) { - printk("PCI: Enabling device %s (%04x -> %04x)\n", + printk(KERN_NOTICE "PCI: Enabling device %s (%04x -> %04x)\n", dev->slot_name, old_cmd, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); } diff -urN linux-2.6.0-test1/arch/mips/pci/fixup-ite8172g.c linux-2.6.0-test1-printk-mips/arch/mips/pci/fixup-ite8172g.c --- linux-2.6.0-test1/arch/mips/pci/fixup-ite8172g.c 2003-07-13 23:34:42.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/fixup-ite8172g.c 2003-07-16 16:17:06.000000000 -0400 @@ -181,7 +181,7 @@ continue; /* do nothing */ } #ifdef DEBUG - printk("irq fixup: slot %d, int line %d, int number %d\n", + printk(KERN_INFO "irq fixup: slot %d, int line %d, int number %d\n", slot, pin, dev->irq); #endif pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq); diff -urN linux-2.6.0-test1/arch/mips/pci/fixup-ivr.c linux-2.6.0-test1-printk-mips/arch/mips/pci/fixup-ivr.c --- linux-2.6.0-test1/arch/mips/pci/fixup-ivr.c 2003-07-13 23:30:37.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/fixup-ivr.c 2003-07-16 16:10:01.000000000 -0400 @@ -145,7 +145,7 @@ break; } #ifdef DEBUG - printk("irq fixup: slot %d, int line %d, int number %d\n", + printk(KERN_DEBUG "irq fixup: slot %d, int line %d, int number %d\n", slot, pin, dev->irq); #endif pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq); diff -urN linux-2.6.0-test1/arch/mips/pci/fixups-ev96100.c linux-2.6.0-test1-printk-mips/arch/mips/pci/fixups-ev96100.c --- linux-2.6.0-test1/arch/mips/pci/fixups-ev96100.c 2003-07-13 23:32:43.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/fixups-ev96100.c 2003-07-16 16:15:01.000000000 -0400 @@ -69,7 +69,7 @@ &vendor); #ifdef DEBUG - printk("devfn %x, slot %d devid %x\n", + printk(KERN_DEBUG "devfn %x, slot %d devid %x\n", dev->devfn, slot, gt_devid); #endif diff -urN linux-2.6.0-test1/arch/mips/pci/ops-au1000.c linux-2.6.0-test1-printk-mips/arch/mips/pci/ops-au1000.c --- linux-2.6.0-test1/arch/mips/pci/ops-au1000.c 2003-07-13 23:38:41.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/ops-au1000.c 2003-07-16 16:22:23.000000000 -0400 @@ -161,13 +161,13 @@ #if 0 if (access_type == PCI_ACCESS_WRITE) { - printk("cfg write: "); + printk(KERN_DEBUG "cfg write: "); } else { - printk("cfg read: "); + printk(KERN_DEBUG "cfg read: "); } - printk("devfn %x, device %x func %x \n", devfn, device, function); + printk(KERN_DEBUG "devfn %x, device %x func %x \n", devfn, device, function); if (access_type == PCI_ACCESS_WRITE) { - printk("data %x\n", *data); + printk(KERN_DEBUG "data %x\n", *data); } #endif @@ -189,14 +189,14 @@ status = au_readl(Au1500_PCI_STATCMD); #if 0 if (access_type == PCI_ACCESS_READ) { - printk("read data: %x\n", *data); + printk(KERN_DEBUG "read data: %x\n", *data); } #endif if (status & (1 << 29)) { *data = 0xffffffff; return -1; } else if ((status >> 28) & 0xf) { - printk("PCI ERR detected: status %x\n", status); + printk(KERN_ERR "PCI ERR detected: status %x\n", status); *data = 0xffffffff; return -1; } else { diff -urN linux-2.6.0-test1/arch/mips/pci/ops-ddb5074.c linux-2.6.0-test1-printk-mips/arch/mips/pci/ops-ddb5074.c --- linux-2.6.0-test1/arch/mips/pci/ops-ddb5074.c 2003-07-13 23:28:53.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/ops-ddb5074.c 2003-07-16 16:05:03.000000000 -0400 @@ -323,9 +323,9 @@ db_verify(pci_read_config_dword (&dev, i * 4, &temp), == PCIBIOS_SUCCESSFUL); - printk("\t%08X", temp); + printk(KERN_INFO "\t%08X", temp); if ((i % 4) == 3) - printk("\n"); + printk(KERN_INFO "\n"); } } } diff -urN linux-2.6.0-test1/arch/mips/pci/ops-ddb5476.c linux-2.6.0-test1-printk-mips/arch/mips/pci/ops-ddb5476.c --- linux-2.6.0-test1/arch/mips/pci/ops-ddb5476.c 2003-07-13 23:30:43.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/ops-ddb5476.c 2003-07-16 16:12:45.000000000 -0400 @@ -338,9 +338,9 @@ db_verify(pci_read_config_dword (&dev, i * 4, &temp), == PCIBIOS_SUCCESSFUL); - printk("\t%08X", temp); + printk(KERN_INFO "\t%08X", temp); if ((i % 4) == 3) - printk("\n"); + printk(KERN_INFO "\n"); } } } diff -urN linux-2.6.0-test1/arch/mips/pci/ops-ev96100.c linux-2.6.0-test1-printk-mips/arch/mips/pci/ops-ev96100.c --- linux-2.6.0-test1/arch/mips/pci/ops-ev96100.c 2003-07-13 23:32:31.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/ops-ev96100.c 2003-07-16 16:14:33.000000000 -0400 @@ -125,7 +125,7 @@ if (intr & (GT_INTRCAUSE_MASABORT0_BIT | GT_INTRCAUSE_TARABORT0_BIT)) { - //printk("config access error: %x:%x\n", dev_fn,where); + /* printk(KERN_ERR "config access error: %x:%x\n", dev_fn,where); */ /* Error occured */ /* Clear bits */ diff -urN linux-2.6.0-test1/arch/mips/pci/pci-cobalt.c linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-cobalt.c --- linux-2.6.0-test1/arch/mips/pci/pci-cobalt.c 2003-07-13 23:38:02.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-cobalt.c 2003-07-16 16:21:49.000000000 -0400 @@ -38,7 +38,7 @@ } while (--timeout > 0); if ((timeout <= 0) || (ctrl & PCI_BIST_CODE_MASK)) printk - ("PCI: Expansion slot card failed BIST with code %x\n", + (KERN_ERR "PCI: Expansion slot card failed BIST with code %x\n", (ctrl & PCI_BIST_CODE_MASK)); } @@ -374,7 +374,7 @@ { unsigned int devfn = PCI_DEVFN(COBALT_PCICONF_VIA, 0); - printk("PCI: Probing PCI hardware\n"); + printk(KERN_INFO "PCI: Probing PCI hardware\n"); /* Read the cobalt id register out of the PCI config space */ PCI_CFG_SET(devfn, (VIA_COBALT_BRD_ID_REG & ~0x3)); @@ -382,7 +382,7 @@ >> ((VIA_COBALT_BRD_ID_REG & 3) * 8); cobalt_board_id = VIA_COBALT_BRD_REG_to_ID(cobalt_board_id); - printk("Cobalt Board ID: %d\n", cobalt_board_id); + printk(KERN_INFO "Cobalt Board ID: %d\n", cobalt_board_id); ioport_resource.start = 0x00000000; ioport_resource.end = 0x0fffffff; @@ -408,7 +408,7 @@ pci_read_config_word(dev, PCI_COMMAND, &cmd); pci_read_config_word(dev, PCI_STATUS, &status); - printk("PCI: Enabling device %s (%04x %04x)\n", dev->slot_name, + printk(KERN_INFO "PCI: Enabling device %s (%04x %04x)\n", dev->slot_name, cmd, status); /* We'll sort this out when we know it isn't enabled ;) */ diff -urN linux-2.6.0-test1/arch/mips/pci/pci-ddb5074.c linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-ddb5074.c --- linux-2.6.0-test1/arch/mips/pci/pci-ddb5074.c 2003-07-13 23:30:41.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-ddb5074.c 2003-07-16 16:10:21.000000000 -0400 @@ -63,7 +63,7 @@ while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { slot_num = PCI_SLOT(dev->devfn); db_assert(slot_num < MAX_SLOT_NUM); - printk("irq_map[%d]: %02x\n", slot_num, irq_map[slot_num]); + printk(KERN_INFO "irq_map[%d]: %02x\n", slot_num, irq_map[slot_num]); db_assert(irq_map[slot_num] != 0xff); pci_write_config_byte(dev, diff -urN linux-2.6.0-test1/arch/mips/pci/pci-ddb5477.c linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-ddb5477.c --- linux-2.6.0-test1/arch/mips/pci/pci-ddb5477.c 2003-07-13 23:33:45.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-ddb5477.c 2003-07-16 16:15:31.000000000 -0400 @@ -262,7 +262,7 @@ #define M1535_INDEX_PORT 0x3f0 #define M1535_DATA_PORT 0x3f1 - printk("Configuring ALI M1535 Super I/O mouse irq.\n"); + printk(KERN_INFO "Configuring ALI M1535 Super I/O mouse irq.\n"); request_region(M1535_CONFIG_PORT, 2, "M1535 Super I/O config"); @@ -287,7 +287,7 @@ || dev->device == PCI_DEVICE_ID_AL_M1533) { u8 old; printk - ("Enabling ALI M1533/35 PS2 keyboard/mouse.\n"); + (KERN_INFO "Enabling ALI M1533/35 PS2 keyboard/mouse.\n"); pci_read_config_byte(dev, 0x41, &old); pci_write_config_byte(dev, 0x41, old | 0xd0); } diff -urN linux-2.6.0-test1/arch/mips/pci/pci-hplj.c linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-hplj.c --- linux-2.6.0-test1/arch/mips/pci/pci-hplj.c 2003-07-13 23:36:48.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-hplj.c 2003-07-16 16:19:47.000000000 -0400 @@ -35,7 +35,7 @@ *val = (le32_to_cpu(*pci_config_data_reg) >> ((where & 3) << 3)) & 0xff; - //printk("pci_read_byte 0x%x == 0x%x\n", where, *val); + //printk(KERN_DEBUG "pci_read_byte 0x%x == 0x%x\n", where, *val); return PCIBIOS_SUCCESSFUL; } @@ -48,7 +48,7 @@ *val = (le32_to_cpu(*pci_config_data_reg) >> ((where & 3) << 3)) & 0xffff; - //printk("pci_read_word 0x%x == 0x%x\n", where, *val); + //printk(KERN_DEBUG "pci_read_word 0x%x == 0x%x\n", where, *val); return PCIBIOS_SUCCESSFUL; } @@ -59,7 +59,7 @@ return PCIBIOS_BAD_REGISTER_NUMBER; *pci_config_address_reg = cfgaddr(dev, where); *val = le32_to_cpu(*pci_config_data_reg); - //printk("pci_read_dword 0x%x == 0x%x\n", where, *val); + //printk(KERN_DEBUG "pci_read_dword 0x%x == 0x%x\n", where, *val); return PCIBIOS_SUCCESSFUL; } @@ -68,7 +68,7 @@ { *pci_config_address_reg = cfgaddr(dev, where); *(volatile u8 *) (((int) pci_config_data_reg) + (where & 3)) = val; - //printk("pci_write_byte 0x%x = 0x%x\n", where, val); + //printk(KERN_DEBUG "pci_write_byte 0x%x = 0x%x\n", where, val); return PCIBIOS_SUCCESSFUL; } @@ -80,7 +80,7 @@ *pci_config_address_reg = cfgaddr(dev, where); *(volatile u16 *) (((int) pci_config_data_reg) + (where & 2)) = le16_to_cpu(val); - //printk("pci_write_word 0x%x = 0x%x\n", where, val); + //printk(KERN_DEBUG "pci_write_word 0x%x = 0x%x\n", where, val); return PCIBIOS_SUCCESSFUL; } @@ -91,7 +91,7 @@ return PCIBIOS_BAD_REGISTER_NUMBER; *pci_config_address_reg = cfgaddr(dev, where); *pci_config_data_reg = le32_to_cpu(val); - //printk("pci_write_dword 0x%x = 0x%x\n", where, val); + //printk(KERN_DEBUG "pci_write_dword 0x%x = 0x%x\n", where, val); return PCIBIOS_SUCCESSFUL; } @@ -169,7 +169,7 @@ pci_regs_base_offset = 0xbff70000; break; default: - printk("ERROR: PCI does not support %s Asic\n", + printk(KERN_ERR "ERROR: PCI does not support %s Asic\n", GetAsicName()); while (1); break; @@ -219,7 +219,7 @@ int pos; int bases; - printk("adjusting pci device: %s\n", dev->name); + printk(KERN_INFO "adjusting pci device: %s\n", dev->name); switch (dev->hdr_type) { case PCI_HEADER_TYPE_NORMAL: diff -urN linux-2.6.0-test1/arch/mips/pci/pci-ip27.c linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-ip27.c --- linux-2.6.0-test1/arch/mips/pci/pci-ip27.c 2003-07-13 23:38:52.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-ip27.c 2003-07-16 16:23:34.000000000 -0400 @@ -141,7 +141,7 @@ ioport_resource.end = ~0UL; for (i = 0; i < num_bridges; i++) { - printk("PCI: Probing PCI hardware on host bus %2d.\n", i); + printk(KERN_INFO "PCI: Probing PCI hardware on host bus %2d.\n", i); pci_scan_bus(i, ops, NULL); } @@ -266,7 +266,7 @@ { unsigned long bus_id = (unsigned) d->bus->number; - printk("PCI: Fixing base addresses for IOC3 device %s\n", + printk(KERN_INFO "PCI: Fixing base addresses for IOC3 device %s\n", d->slot_name); d->resource[0].start |= NODE_OFFSET(bus_to_nid[bus_id]); @@ -281,7 +281,7 @@ d->resource[0].start |= ((unsigned long) (bus_to_nid[d->bus->number]) << 32); - printk("PCI: Fixing isp1020 in [bus:slot.fn] %s\n", d->slot_name); + printk(KERN_INFO "PCI: Fixing isp1020 in [bus:slot.fn] %s\n", d->slot_name); /* * Configure device to allow bus mastering, i/o and memory mapping. @@ -311,7 +311,7 @@ unsigned int start; unsigned short command; - printk("PCI: Fixing isp2x00 in [bus:slot.fn] %s\n", d->slot_name); + printk(KERN_INFO "PCI: Fixing isp2x00 in [bus:slot.fn] %s\n", d->slot_name); /* set the resource struct for this device */ start = (u32) (u64) bridge; /* yes, we want to lose the upper 32 bits here */ @@ -355,7 +355,7 @@ /* set pci bus timeout */ bridge->b_bus_timeout |= BRIDGE_BUS_PCI_RETRY_HLD(0x3); bridge->b_wid_tflush; - printk("PCI: bridge bus timeout= 0x%x \n", bridge->b_bus_timeout); + printk(KERN_WARNING "PCI: bridge bus timeout= 0x%x \n", bridge->b_bus_timeout); /* set host error field */ bridge->b_int_host_err = 0x44; @@ -363,7 +363,7 @@ bridge->b_wid_tflush; /* wait until Bridge PIO complete */ for (i = 0; i < 8; i++) - printk("PCI: device(%d)= 0x%x\n", i, + printk(KERN_INFO "PCI: device(%d)= 0x%x\n", i, bridge->b_device[i].reg); /* configure device to allow bus mastering, i/o and memory mapping */ diff -urN linux-2.6.0-test1/arch/mips/pci/pci-ip32.c linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-ip32.c --- linux-2.6.0-test1/arch/mips/pci/pci-ip32.c 2003-07-13 23:37:25.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-ip32.c 2003-07-16 16:21:12.000000000 -0400 @@ -128,7 +128,7 @@ u32 rev = mace_read_32(MACEPCI_REV); int i; - printk("MACE: PCI rev %d detected at %016lx\n", rev, + printk(KERN_INFO "MACE: PCI rev %d detected at %016lx\n", rev, (u64) MACE_BASE + MACE_PCI); /* These are *bus* addresses */ @@ -153,13 +153,13 @@ #ifdef DEBUG_MACE_PCI while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { - printk("Device: %d/%d/%d ARCS-assigned bus resource map\n", + printk(KERN_DEBUG "Device: %d/%d/%d ARCS-assigned bus resource map\n", dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn)); for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { if (dev->resource[i].start == 0) continue; - printk("%d: %016lx - %016lx (flags %04lx)\n", + printk(KERN_DEBUG "%d: %016lx - %016lx (flags %04lx)\n", i, dev->resource[i].start, dev->resource[i].end, dev->resource[i].flags); @@ -248,18 +248,18 @@ } */ #ifdef DEBUG_MACE_PCI - printk("Triggering PCI bridge interrupt...\n"); + printk(KERN_DEBUG "Triggering PCI bridge interrupt...\n"); mace_write_32(MACEPCI_ERROR_FLAGS, MACEPCI_ERROR_INTERRUPT_TEST); dev = NULL; while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { - printk("Device: %d/%d/%d final bus resource map\n", + printk(KERN_DEBUG "Device: %d/%d/%d final bus resource map\n", dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn)); for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { if (dev->resource[i].start == 0) continue; - printk("%d: %016lx - %016lx (flags %04lx)\n", + printk(KERN_DEBUG "%d: %016lx - %016lx (flags %04lx)\n", i, dev->resource[i].start, dev->resource[i].end, dev->resource[i].flags); @@ -392,60 +392,60 @@ space = 'X'; if (flags & MACEPCI_ERROR_MASTER_ABORT) { - printk("MACEPCI: Master abort at 0x%08x (%c)\n", + printk(KERN_ERR "MACEPCI: Master abort at 0x%08x (%c)\n", error_addr, space); mace_write_32(MACEPCI_ERROR_FLAGS, flags & ~MACEPCI_ERROR_MASTER_ABORT); } if (flags & MACEPCI_ERROR_TARGET_ABORT) { - printk("MACEPCI: Target abort at 0x%08x (%c)\n", + printk(KERN_ERR "MACEPCI: Target abort at 0x%08x (%c)\n", error_addr, space); mace_write_32(MACEPCI_ERROR_FLAGS, flags & ~MACEPCI_ERROR_TARGET_ABORT); } if (flags & MACEPCI_ERROR_DATA_PARITY_ERR) { - printk("MACEPCI: Data parity error at 0x%08x (%c)\n", + printk(KERN_ERR "MACEPCI: Data parity error at 0x%08x (%c)\n", error_addr, space); mace_write_32(MACEPCI_ERROR_FLAGS, flags & ~MACEPCI_ERROR_DATA_PARITY_ERR); } if (flags & MACEPCI_ERROR_RETRY_ERR) { - printk("MACEPCI: Retry error at 0x%08x (%c)\n", error_addr, + printk(KERN_ERR "MACEPCI: Retry error at 0x%08x (%c)\n", error_addr, space); mace_write_32(MACEPCI_ERROR_FLAGS, flags & ~MACEPCI_ERROR_RETRY_ERR); } if (flags & MACEPCI_ERROR_ILLEGAL_CMD) { - printk("MACEPCI: Illegal command at 0x%08x (%c)\n", + printk(KERN_ERR "MACEPCI: Illegal command at 0x%08x (%c)\n", error_addr, space); mace_write_32(MACEPCI_ERROR_FLAGS, flags & ~MACEPCI_ERROR_ILLEGAL_CMD); } if (flags & MACEPCI_ERROR_SYSTEM_ERR) { - printk("MACEPCI: System error at 0x%08x (%c)\n", + printk(KERN_ERR "MACEPCI: System error at 0x%08x (%c)\n", error_addr, space); mace_write_32(MACEPCI_ERROR_FLAGS, flags & ~MACEPCI_ERROR_SYSTEM_ERR); } if (flags & MACEPCI_ERROR_PARITY_ERR) { - printk("MACEPCI: Parity error at 0x%08x (%c)\n", + printk(KERN_ERR "MACEPCI: Parity error at 0x%08x (%c)\n", error_addr, space); mace_write_32(MACEPCI_ERROR_FLAGS, flags & ~MACEPCI_ERROR_PARITY_ERR); } if (flags & MACEPCI_ERROR_OVERRUN) { - printk("MACEPCI: Overrun error at 0x%08x (%c)\n", + printk(KERN_ERR "MACEPCI: Overrun error at 0x%08x (%c)\n", error_addr, space); mace_write_32(MACEPCI_ERROR_FLAGS, flags & ~MACEPCI_ERROR_OVERRUN); } if (flags & MACEPCI_ERROR_SIG_TABORT) { - printk("MACEPCI: Signaled target abort (clearing)\n"); + printk(KERN_ERR "MACEPCI: Signaled target abort (clearing)\n"); mace_write_32(MACEPCI_ERROR_FLAGS, flags & ~MACEPCI_ERROR_SIG_TABORT); } if (flags & MACEPCI_ERROR_INTERRUPT_TEST) { - printk("MACEPCI: Interrupt test triggered (clearing)\n"); + printk(KERN_ERR "MACEPCI: Interrupt test triggered (clearing)\n"); mace_write_32(MACEPCI_ERROR_FLAGS, flags & ~MACEPCI_ERROR_INTERRUPT_TEST); } diff -urN linux-2.6.0-test1/arch/mips/pci/pci-lasat.c linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-lasat.c --- linux-2.6.0-test1/arch/mips/pci/pci-lasat.c 2003-07-13 23:36:38.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-lasat.c 2003-07-16 16:18:39.000000000 -0400 @@ -128,7 +128,7 @@ | (where & ~3); #ifdef DEBUG_PCI - printk("PCI config %s: adr %x", + printk(KERN_DEBUG "PCI config %s: adr %x", access_type == PCI_ACCESS_WRITE ? "write" : "read", adr); #endif @@ -139,7 +139,7 @@ } #ifdef DEBUG_PCI - printk(" value = %x\n", *val); + printk(KERN_DEBUG " value = %x\n", *val); #endif /* Check for master or target abort */ @@ -151,7 +151,7 @@ if (err) { /* Error occured */ #ifdef DEBUG_PCI - printk("\terror %x at adr %x\n", err, + printk(KERN_DEBUG "\terror %x at adr %x\n", err, vrc_pciregs[LO(NILE4_PCIERR)]); #endif return -1; diff -urN linux-2.6.0-test1/arch/mips/pci/pci-mips.c linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-mips.c --- linux-2.6.0-test1/arch/mips/pci/pci-mips.c 2003-07-13 23:29:27.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-mips.c 2003-07-16 16:09:00.000000000 -0400 @@ -245,7 +245,7 @@ break; default: printk - ("Unknown Core card, don't know the system controller.\n"); + (KERN_ERR "Unknown Core card, don't know the system controller.\n"); return -1; } @@ -354,7 +354,7 @@ break; default: printk - ("Unknown Core card, don't know the system controller.\n"); + (KERN_ERR "Unknown Core card, don't know the system controller.\n"); return -1; } return irq; @@ -367,7 +367,7 @@ unsigned char reg_val; #endif - printk("PCI: Probing PCI hardware on host bus 0.\n"); + printk(KERN_INFO "PCI: Probing PCI hardware on host bus 0.\n"); pci_scan_bus(0, &mips_pci_ops, NULL); switch (mips_revision_corid) { diff -urN linux-2.6.0-test1/arch/mips/pci/pci-sb1250.c linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-sb1250.c --- linux-2.6.0-test1/arch/mips/pci/pci-sb1250.c 2003-07-13 23:31:20.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-sb1250.c 2003-07-16 16:13:36.000000000 -0400 @@ -191,7 +191,7 @@ PCI_COMMAND)); if (!(cmdreg & PCI_COMMAND_MASTER)) { printk - ("PCI: Skipping PCI probe. Bus is not initialized.\n"); + (KERN_INFO "PCI: Skipping PCI probe. Bus is not initialized.\n"); iounmap(cfg_space); return; } @@ -236,7 +236,7 @@ /* Probe for PCI hardware */ - printk("PCI: Probing PCI hardware on host bus 0.\n"); + printk(KERN_INFO "PCI: Probing PCI hardware on host bus 0.\n"); pci_scan_bus(0, &sb1250_pci_ops, NULL); #ifdef CONFIG_VGA_CONSOLE diff -urN linux-2.6.0-test1/arch/mips/pci/pci-sni.c linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-sni.c --- linux-2.6.0-test1/arch/mips/pci/pci-sni.c 2003-07-13 23:29:21.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/pci-sni.c 2003-07-16 16:08:27.000000000 -0400 @@ -54,7 +54,7 @@ case 0: break; default: - printk("PCI device on bus %d, dev %d, function %d " + printk(KERN_ERR "PCI device on bus %d, dev %d, function %d " "impossible interrupt configured.\n", dev->bus->number, PCI_SLOT(dev->devfn), PCI_SLOT(dev->devfn)); diff -urN linux-2.6.0-test1/arch/mips/pci/pci.c linux-2.6.0-test1-printk-mips/arch/mips/pci/pci.c --- linux-2.6.0-test1/arch/mips/pci/pci.c 2003-07-13 23:35:15.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/pci/pci.c 2003-07-16 16:17:32.000000000 -0400 @@ -95,7 +95,7 @@ int pos; int bases; - printk("adjusting pci device: %s\n", dev->name); + printk(KERN_INFO "adjusting pci device: %s\n", dev->name); switch (dev->hdr_type) { case PCI_HEADER_TYPE_NORMAL: @@ -184,7 +184,7 @@ } if (io) return IORESOURCE_IO; - //printk(KERN_WARNING "PCI: bridge %s does not support I/O forwarding!\n", bridge->name); + /* printk(KERN_WARNING "PCI: bridge %s does not support I/O forwarding!\n", bridge->name); */ return 0; } diff -urN linux-2.6.0-test1/arch/mips/sgi-ip22/ip22-setup.c linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip22/ip22-setup.c --- linux-2.6.0-test1/arch/mips/sgi-ip22/ip22-setup.c 2003-07-13 23:29:32.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip22/ip22-setup.c 2003-07-17 20:05:05.000000000 -0400 @@ -58,7 +58,7 @@ if (!stop_a_enabled) return; - printk("\n"); + printk(KERN_NOTICE "\n"); ArcEnterInteractiveMode(); } diff -urN linux-2.6.0-test1/arch/mips/sgi-ip22/ip22-time.c linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip22/ip22-time.c --- linux-2.6.0-test1/arch/mips/sgi-ip22/ip22-time.c 2003-07-13 23:31:22.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip22/ip22-time.c 2003-07-17 20:07:02.000000000 -0400 @@ -148,20 +148,20 @@ } while (!r4k_ticks[1]); if (r4k_ticks[0] != r4k_ticks[1]) { - printk("warning: timer counts differ, retrying... "); + printk(KERN_WARNING "warning: timer counts differ, retrying... "); r4k_ticks[2] = dosample(); if (r4k_ticks[2] == r4k_ticks[0] || r4k_ticks[2] == r4k_ticks[1]) r4k_tick = r4k_ticks[2]; else { - printk("disagreement, using average... "); + printk(KERN_WARNING "disagreement, using average... "); r4k_tick = (r4k_ticks[0] + r4k_ticks[1] + r4k_ticks[2]) / 3; } } else r4k_tick = r4k_ticks[0]; - printk("%d [%d.%02d MHz CPU]\n", (int) r4k_tick, + printk(KERN_INFO "%d [%d.%02d MHz CPU]\n", (int) r4k_tick, (int) (r4k_tick / 5000), (int) (r4k_tick % 5000) / 50); mips_counter_frequency = r4k_tick * HZ; diff -urN linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-berr.c linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-berr.c --- linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-berr.c 2003-07-13 23:32:29.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-berr.c 2003-07-16 20:22:40.000000000 -0400 @@ -33,24 +33,24 @@ int wrb = errst1 & PI_ERR_ST1_WRBRRB_MASK; if (!(errst0 & PI_ERR_ST0_VALID_MASK)) { - printk("Hub does not contain valid error information\n"); + printk(KERN_ERR "Hub does not contain valid error information\n"); return; } - printk("Hub has valid error information:\n"); + printk(KERN_ERR "Hub has valid error information:\n"); if (errst0 & PI_ERR_ST0_OVERRUN_MASK) - printk("Overrun is set. Error stack may contain additional " + printk(KERN_ERR "Overrun is set. Error stack may contain additional " "information.\n"); - printk("Hub error address is %08lx\n", + printk(KERN_ERR "Hub error address is %08lx\n", (errst0 & PI_ERR_ST0_ADDR_MASK) >> (PI_ERR_ST0_ADDR_SHFT - 3)); - printk("Incoming message command 0x%lx\n", + printk(KERN_ERR "Incoming message command 0x%lx\n", (errst0 & PI_ERR_ST0_CMD_MASK) >> PI_ERR_ST0_CMD_SHFT); - printk("Supplemental field of incoming message is 0x%lx\n", + printk(KERN_ERR "Supplemental field of incoming message is 0x%lx\n", (errst0 & PI_ERR_ST0_SUPPL_MASK) >> PI_ERR_ST0_SUPPL_SHFT); - printk("T5 Rn (for RRB only) is 0x%lx\n", + printk(KERN_ERR "T5 Rn (for RRB only) is 0x%lx\n", (errst0 & PI_ERR_ST0_REQNUM_MASK) >> PI_ERR_ST0_REQNUM_SHFT); - printk("Error type is %s\n", err_type[wrb] + printk(KERN_ERR "Error type is %s\n", err_type[wrb] [(errst0 & PI_ERR_ST0_TYPE_MASK) >> PI_ERR_ST0_TYPE_SHFT] ? : "invalid"); } @@ -64,10 +64,10 @@ if (is_fixup) return MIPS_BE_FIXUP; - printk("Slice %c got %cbe at 0x%lx\n", 'A' + cpu, data ? 'd' : 'i', + printk(KERN_NOTICE "Slice %c got %cbe at 0x%lx\n", 'A' + cpu, data ? 'd' : 'i', regs->cp0_epc); - printk("Hub information:\n"); - printk("ERR_INT_PEND = 0x%06lx\n", LOCAL_HUB_L(PI_ERR_INT_PEND)); + printk(KERN_NOTICE "Hub information:\n"); + printk(KERN_NOTICE "ERR_INT_PEND = 0x%06lx\n", LOCAL_HUB_L(PI_ERR_INT_PEND)); errst0 = LOCAL_HUB_L(cpu ? PI_ERR_STATUS0_B : PI_ERR_STATUS0_A); errst1 = LOCAL_HUB_L(cpu ? PI_ERR_STATUS1_B : PI_ERR_STATUS1_A); dump_hub_information(errst0, errst1); diff -urN linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-init.c linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-init.c --- linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-init.c 2003-07-13 23:38:38.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-init.c 2003-07-17 16:41:35.000000000 -0400 @@ -204,7 +204,7 @@ */ CPUMASK_CLRALL(boot_cpumask); maxcpus = cpu_node_probe(&boot_cpumask, &numnodes); - printk("Discovered %d cpus on %d nodes\n", maxcpus, numnodes); + printk(KERN_INFO "Discovered %d cpus on %d nodes\n", maxcpus, numnodes); init_topology_matrix(); dump_topology(); @@ -526,7 +526,7 @@ for (cnode = 0; cnode < numnodes; cnode++) { #if 0 if (cnodetocpu(cnode) == -1) { - printk("Initializing headless hub,cnode %d", cnode); + printk(KERN_INFO "Initializing headless hub,cnode %d", cnode); per_hub_init(cnode); } #endif @@ -630,11 +630,11 @@ } if (router_a == NULL) { - printk("node_distance: router_a NULL\n"); + printk(KERN_WARNING "node_distance: router_a NULL\n"); return -1; } if (router_b == NULL) { - printk("node_distance: router_b NULL\n"); + printk(KERN_WARNING "node_distance: router_b NULL\n"); return -1; } @@ -678,17 +678,17 @@ klrou_t *router; cnodeid_t row, col; - printk("************** Topology ********************\n"); + printk(KERN_NOTICE "************** Topology ********************\n"); - printk(" "); + printk(KERN_NOTICE " "); for (col = 0; col < numnodes; col++) - printk("%02d ", col); - printk("\n"); + printk(KERN_NOTICE "%02d ", col); + printk(KERN_NOTICE "\n"); for (row = 0; row < numnodes; row++) { - printk("%02d ", row); + printk(KERN_NOTICE "%02d ", row); for (col = 0; col < numnodes; col++) - printk("%2d ", node_distances[row][col]); - printk("\n"); + printk(KERN_NOTICE "%2d ", node_distances[row][col]); + printk(KERN_NOTICE "\n"); } for (cnode = 0; cnode < numnodes; cnode++) { @@ -705,7 +705,7 @@ do { if (brd->brd_flags & DUPLICATE_BOARD) continue; - printk("Router %d:", router_num); + printk(KERN_NOTICE "Router %d:", router_num); router_num++; router = (klrou_t *)NODE_OFFSET_TO_K0(NASID_GET(brd), brd->brd_compts[0]); @@ -719,11 +719,11 @@ router->rou_port[port].port_offset); if (dest_brd->brd_type == KLTYPE_IP27) - printk(" %d", dest_brd->brd_nasid); + printk(KERN_NOTICE " %d", dest_brd->brd_nasid); if (dest_brd->brd_type == KLTYPE_ROUTER) - printk(" r"); + printk(KERN_NOTICE " r"); } - printk("\n"); + printk(KERN_NOTICE "\n"); } while ( (brd = find_lboard_class(KLCF_NEXT(brd), KLTYPE_ROUTER)) ); } @@ -743,7 +743,7 @@ gdap = (gda_t *)GDA_ADDR(get_nasid()); if (gdap->g_magic != GDA_MAGIC) { - printk("dumpklcfg_cmd: Invalid GDA MAGIC\n"); + printk(KERN_NOTICE "dumpklcfg_cmd: Invalid GDA MAGIC\n"); return; } @@ -753,24 +753,24 @@ if (nasid == INVALID_NASID) continue; - printk("\nDumpping klconfig Nasid %d:\n", nasid); + printk(KERN_NOTICE "\nDumpping klconfig Nasid %d:\n", nasid); lbptr = KL_CONFIG_INFO(nasid); while (lbptr) { - printk(" %s, Nasid %d, Module %d, widget 0x%x, partition %d, NIC 0x%x lboard 0x%lx", + printk(KERN_NOTICE " %s, Nasid %d, Module %d, widget 0x%x, partition %d, NIC 0x%x lboard 0x%lx", "board name here", /* BOARD_NAME(lbptr->brd_type), */ lbptr->brd_nasid, lbptr->brd_module, lbptr->brd_widgetnum, lbptr->brd_partition, (lbptr->brd_nic), lbptr); if (lbptr->brd_flags & DUPLICATE_BOARD) - printk(" -D"); - printk("\n"); + printk(KERN_NOTICE " -D"); + printk(KERN_NOTICE "\n"); for (i = 0; i < lbptr->brd_numcompts; i++) { klinfo_t *kli; kli = NODE_OFFSET_TO_KLINFO(NASID_GET(lbptr), lbptr->brd_compts[i]); - printk(" type %2d, flags 0x%04x, diagval %3d, physid %4d, virtid %2d: %s\n", + printk(KERN_NOTICE " type %2d, flags 0x%04x, diagval %3d, physid %4d, virtid %2d: %s\n", kli->struct_type, kli->flags, kli->diagval, @@ -782,7 +782,7 @@ lbptr = KLCF_NEXT(lbptr); } } - printk("\n"); + printk(KERN_NOTICE "\n"); /* Useful to print router maps also */ @@ -801,19 +801,19 @@ if(!lbptr) break; if (!KL_CONFIG_DUPLICATE_BOARD(lbptr)) { - printk("%llx -> \n", lbptr->brd_nic); + printk(KERN_NOTICE "%llx -> \n", lbptr->brd_nic); kr = (klrou_t *)find_first_component(lbptr, KLSTRUCT_ROU); for (i = 1; i <= MAX_ROUTER_PORTS; i++) { - printk("[%d, %llx]; ", + printk(KERN_NOTICE "[%d, %llx]; ", kr->rou_port[i].port_nasid, kr->rou_port[i].port_offset); } - printk("\n"); + printk(KERN_NOTICE "\n"); } lbptr = KLCF_NEXT(lbptr); } - printk("\n"); + printk(KERN_NOTICE "\n"); } dump_topology(); diff -urN linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-irq.c linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-irq.c --- linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-irq.c 2003-07-13 23:34:31.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-irq.c 2003-07-17 16:35:17.000000000 -0400 @@ -100,7 +100,7 @@ return j; } } - printk("Cpu %ld flooded with devices\n", cpunum); + printk(KERN_WARNING "Cpu %ld flooded with devices\n", cpunum); while(1); return -1; } @@ -118,7 +118,7 @@ return(j); } } - printk("Could not identify cpu/level for irq %d\n", irq); + printk(KERN_ERR "Could not identify cpu/level for irq %d\n", irq); while(1); return(-1); } @@ -289,10 +289,10 @@ { bridge_t *bridge = (bridge_t *) 0x9200000008000000; - printk("bridge->b_int_status = 0x%x\n", bridge->b_int_status); - printk("bridge->b_int_enable = 0x%x\n", bridge->b_int_enable); - printk("PI_INT_PEND0 = 0x%lx\n", LOCAL_HUB_L(PI_INT_PEND0)); - printk("PI_INT_MASK0_A = 0x%lx\n", LOCAL_HUB_L(PI_INT_MASK0_A)); + printk(KERN_DEBUG "bridge->b_int_status = 0x%x\n", bridge->b_int_status); + printk(KERN_DEBUG "bridge->b_int_enable = 0x%x\n", bridge->b_int_enable); + printk(KERN_DEBUG "PI_INT_PEND0 = 0x%lx\n", LOCAL_HUB_L(PI_INT_PEND0)); + printk(KERN_DEBUG "PI_INT_MASK0_A = 0x%lx\n", LOCAL_HUB_L(PI_INT_MASK0_A)); } void __init init_IRQ(void) diff -urN linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-klconfig.c linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-klconfig.c --- linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-klconfig.c 2003-07-13 23:36:31.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-klconfig.c 2003-07-17 16:36:38.000000000 -0400 @@ -27,7 +27,7 @@ break; index = j; if (index == KLCF_NUM_COMPS(brd)) { - printk("find_component: Bad pointer: 0x%p\n", kli); + printk(KERN_ERR "find_component: Bad pointer: 0x%p\n", kli); return (klinfo_t *)NULL; } index++; /* next component */ @@ -106,7 +106,7 @@ cnodeid_t cnode; if (!(cpu < MAXCPUS)) { - printk("sn_get_cpuinfo: illegal cpuid 0x%lx\n", cpu); + printk(KERN_ERR "sn_get_cpuinfo: illegal cpuid 0x%lx\n", cpu); return NULL; } diff -urN linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-klnuma.c linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-klnuma.c --- linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-klnuma.c 2003-07-13 23:32:48.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-klnuma.c 2003-07-16 20:37:26.000000000 -0400 @@ -76,7 +76,7 @@ kvp->kv_rw_nasid = master_nasid; kvp->kv_ro_baseaddr = NODE_CAC_BASE(server_nasid); kvp->kv_rw_baseaddr = NODE_CAC_BASE(master_nasid); - printk("REPLICATION: ON nasid %d, ktext from nasid %d, kdata from nasid %d\n", client_nasid, server_nasid, master_nasid); + printk(KERN_INFO "REPLICATION: ON nasid %d, ktext from nasid %d, kdata from nasid %d\n", client_nasid, server_nasid, master_nasid); } /* XXX - When the BTE works, we should use it instead of this. */ diff -urN linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-memory.c linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-memory.c --- linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-memory.c 2003-07-13 23:32:29.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-memory.c 2003-07-16 20:24:20.000000000 -0400 @@ -42,7 +42,7 @@ int numa_debug(void) { - printk("NUMA debug\n"); + printk(KERN_DEBUG "NUMA debug\n"); *(int *)0 = 0; return(0); } @@ -151,7 +151,7 @@ (slot0sz << PAGE_SHIFT)) ignore = 1; if (ignore && slot_psize) { - printk("Ignoring slot %d onwards on node %d\n", + printk(KERN_NOTICE "Ignoring slot %d onwards on node %d\n", slot, node); slot_psize_cache[node][slot] = SLOT_IGNORED; slot = numslots; @@ -208,7 +208,7 @@ reserve_bootmem_node(NODE_DATA(node), slot_firstpfn << PAGE_SHIFT, ((slot_freepfn - slot_firstpfn) << PAGE_SHIFT) + bootmap_size); } - printk("Total memory probed : 0x%lx pages\n", numpages); + printk(KERN_INFO "Total memory probed : 0x%lx pages\n", numpages); } int __init page_is_ram(unsigned long pagenr) @@ -324,7 +324,7 @@ initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; tmp = (unsigned long) nr_free_pages(); - printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, " + printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, " "%ldk data, %ldk init)\n", tmp << (PAGE_SHIFT-10), num_physpages << (PAGE_SHIFT-10), diff -urN linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-nmi.c linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-nmi.c --- linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-nmi.c 2003-07-13 23:28:55.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-nmi.c 2003-07-16 20:20:43.000000000 -0400 @@ -66,10 +66,10 @@ (machreg_t *)(TO_UNCAC(TO_NODE(nasid, IP27_NMI_KREGS_OFFSET)) + slice * IP27_NMI_KREGS_CPU_SIZE); - printk("NMI nasid %d: slice %d\n", nasid, slice); + printk(KERN_NOTICE "NMI nasid %d: slice %d\n", nasid, slice); for (i = 0; i < numberof_nmi_cpu_regs; i++) - printk("0x%lx ", prom_format[i]); - printk("\n\n"); + printk(KERN_NOTICE "0x%lx ", prom_format[i]); + printk(KERN_NOTICE "\n\n"); } /* diff -urN linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-reset.c linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-reset.c --- linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-reset.c 2003-07-13 23:34:39.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-reset.c 2003-07-17 16:36:11.000000000 -0400 @@ -38,7 +38,7 @@ int i; #endif - printk("Reboot started from CPU %d\n", smp_processor_id()); + printk(KERN_NOTICE "Reboot started from CPU %d\n", smp_processor_id()); #ifdef CONFIG_SMP smp_send_stop(); #endif diff -urN linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-setup.c linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-setup.c --- linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-setup.c 2003-07-13 23:32:44.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-setup.c 2003-07-16 20:34:18.000000000 -0400 @@ -94,7 +94,7 @@ int n_mode; n_mode = LOCAL_HUB_L(NI_STATUS_REV_ID) & NSRI_MORENODES_MASK; - printk("Machine is in %c mode.\n", n_mode ? 'N' : 'M'); + printk(KERN_INFO "Machine is in %c mode.\n", n_mode ? 'N' : 'M'); #ifdef CONFIG_SGI_SN0_N_MODE if (!n_mode) panic("Kernel compiled for M mode."); @@ -145,13 +145,13 @@ widget_id = *(volatile widgetreg_t *) (RAW_NODE_SWIN_BASE(nasid, 0x0) + WIDGET_ID); partnum = XWIDGET_PART_NUM(widget_id); - printk("Cpu %d, Nasid 0x%x, pcibr_setup(): found partnum= 0x%x", + printk(KERN_INFO "Cpu %d, Nasid 0x%x, pcibr_setup(): found partnum= 0x%x", smp_processor_id(), nasid, partnum); if (partnum == BRIDGE_WIDGET_PART_NUM) { /* * found direct connected bridge so must be Origin200 */ - printk("...is bridge\n"); + printk(KERN_INFO "...is bridge\n"); num_bridges = 1; bus_to_wid[0] = 0x8; bus_to_nid[0] = 0; @@ -164,16 +164,16 @@ * found xbow, so may have multiple bridges * need to probe xbow */ - printk("...is xbow\n"); + printk(KERN_INFO "...is xbow\n"); if ((brd = find_lboard((lboard_t *)KL_CONFIG_INFO(nasid), KLTYPE_MIDPLANE8)) == NULL) - printk("argh\n"); + printk(KERN_ERR "argh\n"); else - printk("brd = 0x%lx\n", (unsigned long) brd); + printk(KERN_INFO "brd = 0x%lx\n", (unsigned long) brd); if ((xbow_p = (klxbow_t *) find_component(brd, NULL, KLSTRUCT_XBOW)) == NULL) - printk("argh\n"); + printk(KERN_ERR "argh\n"); else { /* * Okay, here's a xbow. Lets arbitrate and find @@ -205,7 +205,7 @@ (RAW_NODE_SWIN_BASE(nasid, i) + WIDGET_ID); partnum = XWIDGET_PART_NUM(widget_id); if (partnum == BRIDGE_WIDGET_PART_NUM) { - printk("widget 0x%x is a bridge\n", i); + printk(KERN_INFO "widget 0x%x is a bridge\n", i); bus_to_wid[num_bridges] = i; bus_to_nid[num_bridges] = nasid; bus_to_baddr[num_bridges] = ((masterwid << 60) | (1UL << 56)); /* Barrier set */ @@ -218,7 +218,7 @@ /* * found xbridge, assume ibrick for now */ - printk("...is xbridge\n"); + printk(KERN_INFO "...is xbridge\n"); bus_to_wid[0] = 0xb; bus_to_wid[1] = 0xe; bus_to_wid[2] = 0xf; @@ -295,17 +295,17 @@ */ DBG("ip27_setup(): Entered.\n"); nid = get_nasid(); - printk("IP27: Running on node %d.\n", nid); + printk(KERN_INFO "IP27: Running on node %d.\n", nid); p = LOCAL_HUB_L(PI_CPU_PRESENT_A) & 1; e = LOCAL_HUB_L(PI_CPU_ENABLE_A) & 1; - printk("Node %d has %s primary CPU%s.\n", nid, + printk(KERN_INFO "Node %d has %s primary CPU%s.\n", nid, p ? "a" : "no", e ? ", CPU is running" : ""); p = LOCAL_HUB_L(PI_CPU_PRESENT_B) & 1; e = LOCAL_HUB_L(PI_CPU_ENABLE_B) & 1; - printk("Node %d has %s secondary CPU%s.\n", nid, + printk(KERN_INFO "Node %d has %s secondary CPU%s.\n", nid, p ? "a" : "no", e ? ", CPU is running" : ""); diff -urN linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-timer.c linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-timer.c --- linux-2.6.0-test1/arch/mips/sgi-ip27/ip27-timer.c 2003-07-13 23:32:43.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip27/ip27-timer.c 2003-07-16 20:25:02.000000000 -0400 @@ -209,7 +209,7 @@ if (!cpu) panic("No information about myself?"); - printk("CPU %d clock is %dMHz.\n", smp_processor_id(), cpu->cpu_speed); + printk(KERN_INFO "CPU %d clock is %dMHz.\n", smp_processor_id(), cpu->cpu_speed); set_c0_status(SRB_TIMOCLK); } diff -urN linux-2.6.0-test1/arch/mips/sgi-ip32/ip32-berr.c linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip32/ip32-berr.c --- linux-2.6.0-test1/arch/mips/sgi-ip32/ip32-berr.c 2003-07-13 23:35:52.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip32/ip32-berr.c 2003-07-17 21:07:56.000000000 -0400 @@ -22,7 +22,7 @@ if (is_fixup) return MIPS_BE_FIXUP; - printk("Got %cbe at 0x%lx\n", data ? 'd' : 'i', regs->cp0_epc); + printk(KERN_EMERG "Got %cbe at 0x%lx\n", data ? 'd' : 'i', regs->cp0_epc); show_regs(regs); dump_tlb_all(); while(1); diff -urN linux-2.6.0-test1/arch/mips/sgi-ip32/ip32-irq.c linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip32/ip32-irq.c --- linux-2.6.0-test1/arch/mips/sgi-ip32/ip32-irq.c 2003-07-13 23:34:31.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip32/ip32-irq.c 2003-07-17 21:07:18.000000000 -0400 @@ -445,28 +445,28 @@ u64 crime; u32 mace; - printk ("Unknown interrupt occurred!\n"); - printk ("cp0_status: %08x\tcp0_cause: %08x\n", + printk (KERN_ALERT "Unknown interrupt occurred!\n"); + printk (KERN_ALERT "cp0_status: %08x\tcp0_cause: %08x\n", read_c0_status(), read_c0_cause()); crime = crime_read_64 (CRIME_INT_MASK); - printk ("CRIME interrupt mask: %016lx\n", crime); + printk (KERN_ALERT "CRIME interrupt mask: %016lx\n", crime); crime = crime_read_64 (CRIME_INT_STAT); - printk ("CRIME interrupt status: %016lx\n", crime); + printk (KERN_ALERT "CRIME interrupt status: %016lx\n", crime); crime = crime_read_64 (CRIME_HARD_INT); - printk ("CRIME hardware interrupt register: %016lx\n", crime); + printk (KERN_ALERT "CRIME hardware interrupt register: %016lx\n", crime); mace = mace_read_32 (MACEISA_INT_MASK); - printk ("MACE ISA interrupt mask: %08x\n", mace); + printk (KERN_ALERT "MACE ISA interrupt mask: %08x\n", mace); mace = mace_read_32 (MACEISA_INT_STAT); - printk ("MACE ISA interrupt status: %08x\n", mace); + printk (KERN_ALERT "MACE ISA interrupt status: %08x\n", mace); mace = mace_read_32 (MACEPCI_CONTROL); - printk ("MACE PCI control register: %08x\n", mace); + printk (KERN_ALERT "MACE PCI control register: %08x\n", mace); - printk("Register dump:\n"); + printk(KERN_ALERT "Register dump:\n"); show_regs(regs); - printk("Please mail this report to linux-mips@oss.sgi.com\n"); - printk("Spinning..."); + printk(KERN_ALERT "Please mail this report to linux-mips@oss.sgi.com\n"); + printk(KERN_ALERT "Spinning..."); while(1) ; } diff -urN linux-2.6.0-test1/arch/mips/sgi-ip32/ip32-timer.c linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip32/ip32-timer.c --- linux-2.6.0-test1/arch/mips/sgi-ip32/ip32-timer.c 2003-07-13 23:37:18.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sgi-ip32/ip32-timer.c 2003-07-17 21:08:14.000000000 -0400 @@ -50,7 +50,7 @@ u64 crime_time; u32 cc_tick; - printk("Calibrating system timer... "); + printk(KERN_INFO "Calibrating system timer... "); crime_time = crime_read_64 (CRIME_TIME) & CRIME_TIME_MASK; cc_tick = read_c0_count(); @@ -66,7 +66,7 @@ */ cc_interval = (cc_interval / PER_MHZ) * PER_MHZ; - printk("%d MHz CPU detected\n", (int) (cc_interval / PER_MHZ)); + printk(KERN_INFO "%d MHz CPU detected\n", (int) (cc_interval / PER_MHZ)); setup_irq (CLOCK_IRQ, irq); } diff -urN linux-2.6.0-test1/arch/mips/sibyte/cfe/setup.c linux-2.6.0-test1-printk-mips/arch/mips/sibyte/cfe/setup.c --- linux-2.6.0-test1/arch/mips/sibyte/cfe/setup.c 2003-07-13 23:31:58.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sibyte/cfe/setup.c 2003-07-17 21:01:47.000000000 -0400 @@ -83,9 +83,9 @@ } } #endif - printk("passing control back to CFE\n"); + printk(KERN_NOTICE "passing control back to CFE\n"); cfe_exit(1, 0); - printk("cfe_exit returned??\n"); + printk(KERN_NOTICE "cfe_exit returned??\n"); while(1); } @@ -212,10 +212,10 @@ goto fail; } initrd_end = initrd_start + initrd_size; - printk("Found initrd of %lx@%lx\n", initrd_size, initrd_start); + printk(KERN_INFO "Found initrd of %lx@%lx\n", initrd_size, initrd_start); return 1; fail: - printk("Bad initrd argument. Disabling initrd\n"); + printk(KERN_INFO "Bad initrd argument. Disabling initrd\n"); initrd_start = 0; initrd_end = 0; return 1; diff -urN linux-2.6.0-test1/arch/mips/sibyte/cfe/smp.c linux-2.6.0-test1-printk-mips/arch/mips/sibyte/cfe/smp.c --- linux-2.6.0-test1/arch/mips/sibyte/cfe/smp.c 2003-07-13 23:37:18.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sibyte/cfe/smp.c 2003-07-17 21:02:09.000000000 -0400 @@ -34,7 +34,7 @@ retval = cfe_cpu_start(cpu, &smp_bootstrap, sp, gp, 0); if (retval != 0) { - printk("cfe_start_cpu(%i) returned %i\n" , cpu, retval); + printk(KERN_INFO "cfe_start_cpu(%i) returned %i\n" , cpu, retval); return 0; } else { return 1; @@ -66,7 +66,7 @@ CPUMASK_SETB(cpu_online_map, i); } } - printk("Detected %i available CPU(s)\n", num_online_cpus()); + printk(KERN_INFO "Detected %i available CPU(s)\n", num_online_cpus()); } void prom_smp_finish(void) diff -urN linux-2.6.0-test1/arch/mips/sibyte/sb1250/bus_watcher.c linux-2.6.0-test1-printk-mips/arch/mips/sibyte/sb1250/bus_watcher.c --- linux-2.6.0-test1/arch/mips/sibyte/sb1250/bus_watcher.c 2003-07-13 23:33:50.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sibyte/sb1250/bus_watcher.c 2003-07-17 21:03:24.000000000 -0400 @@ -56,9 +56,9 @@ static void print_summary(uint32_t status, uint32_t l2_err, uint32_t memio_err) { - printk("Bus watcher error counters: %08x %08x\n", l2_err, memio_err); - printk("\nLast recorded signature:\n"); - printk("Request %02x from %d, answered by %d with Dcode %d\n", + printk(KERN_NOTICE "Bus watcher error counters: %08x %08x\n", l2_err, memio_err); + printk(KERN_NOTICE "\nLast recorded signature:\n"); + printk(KERN_NOTICE "Request %02x from %d, answered by %d with Dcode %d\n", (unsigned int)(G_SCD_BERR_TID(status) & 0x3f), (int)(G_SCD_BERR_TID(status) >> 6), (int)G_SCD_BERR_RID(status), @@ -85,7 +85,7 @@ status = csr_in32(IO_SPACE_BASE | A_SCD_BUS_ERR_STATUS_DEBUG); #endif if (!(status & 0x7fffffff)) { - printk("Using last values reaped by bus watcher driver\n"); + printk(KERN_NOTICE "Using last values reaped by bus watcher driver\n"); status = bw_stats.status; l2_err = bw_stats.l2_err; memio_err = bw_stats.memio_err; @@ -96,7 +96,7 @@ if (status & ~(1UL << 31)) print_summary(status, l2_err, memio_err); else - printk("Bus watcher indicates no error\n"); + printk(KERN_NOTICE "Bus watcher indicates no error\n"); } static int bw_print_buffer(char *page, struct bw_stats_struct *stats) @@ -197,7 +197,7 @@ #ifndef CONFIG_PROC_FS bw_print_buffer(bw_buf, stats); - printk(bw_buf); + printk(KERN_NOTICE bw_buf); #endif } @@ -207,18 +207,18 @@ bw_stats.status_printed = 1; if (request_irq(K_INT_BAD_ECC, sibyte_bw_int, 0, "Bus watcher", &bw_stats)) { - printk("Failed to register bus watcher BAD_ECC irq\n"); + printk(KERN_ERR "Failed to register bus watcher BAD_ECC irq\n"); return -1; } if (request_irq(K_INT_COR_ECC, sibyte_bw_int, 0, "Bus watcher", &bw_stats)) { free_irq(K_INT_BAD_ECC, &bw_stats); - printk("Failed to register bus watcher COR_ECC irq\n"); + printk(KERN_ERR "Failed to register bus watcher COR_ECC irq\n"); return -1; } if (request_irq(K_INT_IO_BUS, sibyte_bw_int, 0, "Bus watcher", &bw_stats)) { free_irq(K_INT_BAD_ECC, &bw_stats); free_irq(K_INT_COR_ECC, &bw_stats); - printk("Failed to register bus watcher IO_BUS irq\n"); + printk(KERN_ERR "Failed to register bus watcher IO_BUS irq\n"); return -1; } diff -urN linux-2.6.0-test1/arch/mips/sibyte/sb1250/irq.c linux-2.6.0-test1-printk-mips/arch/mips/sibyte/sb1250/irq.c --- linux-2.6.0-test1/arch/mips/sibyte/sb1250/irq.c 2003-07-13 23:38:02.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sibyte/sb1250/irq.c 2003-07-17 21:04:14.000000000 -0400 @@ -133,7 +133,7 @@ } if (mask) { - printk("attempted to set irq affinity for irq %d to multiple CPUs\n", irq); + printk(KERN_NOTICE "attempted to set irq affinity for irq %d to multiple CPUs\n", irq); return; } diff -urN linux-2.6.0-test1/arch/mips/sibyte/sb1250/smp.c linux-2.6.0-test1-printk-mips/arch/mips/sibyte/sb1250/smp.c --- linux-2.6.0-test1/arch/mips/sibyte/sb1250/smp.c 2003-07-13 23:34:03.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sibyte/sb1250/smp.c 2003-07-17 21:03:50.000000000 -0400 @@ -120,7 +120,7 @@ struct task_struct *idle; struct pt_regs regs; int retval; - printk("Starting CPU %d... ", cpu); + printk(KERN_INFO "Starting CPU %d... ", cpu); /* Spawn a new process normally. Grab a pointer to its task struct so we can mess with it */ diff -urN linux-2.6.0-test1/arch/mips/sibyte/swarm/setup.c linux-2.6.0-test1-printk-mips/arch/mips/sibyte/swarm/setup.c --- linux-2.6.0-test1/arch/mips/sibyte/swarm/setup.c 2003-07-13 23:34:03.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sibyte/swarm/setup.c 2003-07-17 21:05:53.000000000 -0400 @@ -79,10 +79,10 @@ if (!is_fixup && (regs->cp0_cause & 4)) { /* Data bus error - print PA */ #ifdef CONFIG_MIPS64 - printk("DBE physical address: %010lx\n", + printk(KERN_NOTICE "DBE physical address: %010lx\n", __read_64bit_c0_register($26, 1)); #else - printk("DBE physical address: %010llx\n", + printk(KERN_NOTICE "DBE physical address: %010llx\n", __read_64bit_c0_split($26, 1)); #endif } @@ -101,18 +101,18 @@ board_be_handler = swarm_be_handler; if (xicor_probe()) { - printk("swarm setup: Xicor 1241 RTC detected.\n"); + printk(KERN_INFO "swarm setup: Xicor 1241 RTC detected.\n"); rtc_get_time = xicor_get_time; rtc_set_time = xicor_set_time; } if (m41t81_probe()) { - printk("swarm setup: M41T81 RTC detected.\n"); + printk(KERN_INFO "swarm setup: M41T81 RTC detected.\n"); rtc_get_time = m41t81_get_time; rtc_set_time = m41t81_set_time; } - printk("This kernel optimized for " + printk(KERN_INFO "This kernel optimized for " #ifdef CONFIG_SIMULATION "simulation" #else diff -urN linux-2.6.0-test1/arch/mips/sibyte/swarm/time.c linux-2.6.0-test1-printk-mips/arch/mips/sibyte/swarm/time.c --- linux-2.6.0-test1/arch/mips/sibyte/swarm/time.c 2003-07-13 23:32:29.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sibyte/swarm/time.c 2003-07-17 21:04:57.000000000 -0400 @@ -173,7 +173,7 @@ xicor_write(X1241REG_SR, 0); - printk("set_rtc_mmss: %02d:%02d\n", real_minutes, real_seconds); + printk(KERN_NOTICE "set_rtc_mmss: %02d:%02d\n", real_minutes, real_seconds); return retval; } @@ -230,10 +230,10 @@ out64(0, SMB_CSR(R_SMB_CONTROL)); if ((status = xicor_read(X1241REG_SR_RTCF)) < 0) { - printk("x1241: couldn't detect on SWARM SMBus 1\n"); + printk(KERN_INFO "x1241: couldn't detect on SWARM SMBus 1\n"); } else { if (status & X1241REG_SR_RTCF) - printk("x1241: battery failed -- time is probably wrong\n"); + printk(KERN_INFO "x1241: battery failed -- time is probably wrong\n"); write_seqlock_irqsave(&xtime_lock, flags); xtime.tv_sec = get_swarm_time(); xtime.tv_nsec = 0; diff -urN linux-2.6.0-test1/arch/mips/sni/pci.c linux-2.6.0-test1-printk-mips/arch/mips/sni/pci.c --- linux-2.6.0-test1/arch/mips/sni/pci.c 2003-07-13 23:39:37.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sni/pci.c 2003-07-17 21:09:13.000000000 -0400 @@ -56,7 +56,7 @@ case 0: break; default: - printk("PCI device on bus %d, dev %d, function %d " + printk(KERN_NOTICE "PCI device on bus %d, dev %d, function %d " "impossible interrupt configured.\n", dev->bus->number, PCI_SLOT(dev->devfn), PCI_SLOT(dev->devfn)); diff -urN linux-2.6.0-test1/arch/mips/sni/pcimt_scache.c linux-2.6.0-test1-printk-mips/arch/mips/sni/pcimt_scache.c --- linux-2.6.0-test1/arch/mips/sni/pcimt_scache.c 2003-07-13 23:39:31.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sni/pcimt_scache.c 2003-07-17 21:08:55.000000000 -0400 @@ -22,17 +22,17 @@ scsiz = cacheconf & 7; if (scsiz == 0) { - printk("Second level cache is deactived.\n"); + printk(KERN_INFO "Second level cache is deactived.\n"); return; } if (scsiz >= 6) { - printk("Invalid second level cache size configured, " + printk(KERN_INFO "Invalid second level cache size configured, " "deactivating second level cache.\n"); cacheconf = 0; return; } sc_size = 128 << scsiz; - printk("%dkb second level cache detected, deactivating.\n", sc_size); + printk(KERN_INFO "%dkb second level cache detected, deactivating.\n", sc_size); cacheconf = 0; } diff -urN linux-2.6.0-test1/arch/mips/sni/setup.c linux-2.6.0-test1-printk-mips/arch/mips/sni/setup.c --- linux-2.6.0-test1/arch/mips/sni/setup.c 2003-07-13 23:33:47.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/sni/setup.c 2003-07-17 21:08:33.000000000 -0400 @@ -72,7 +72,7 @@ asic = csmsr & 0x80; asic = (csmsr & 0x08) ? asic : !asic; p += sprintf(p, ", ASIC PCI Rev %s", asic ? "1.0" : "1.1"); - printk("%s.\n", boardtype); + printk(KERN_INFO "%s.\n", boardtype); } void __init sni_rm200_pci_setup(void) Binary files linux-2.6.0-test1/arch/mips/tx4927/common/.tx4927_setup.c.swo and linux-2.6.0-test1-printk-mips/arch/mips/tx4927/common/.tx4927_setup.c.swo differ diff -urN linux-2.6.0-test1/arch/mips/tx4927/common/tx4927_setup.c linux-2.6.0-test1-printk-mips/arch/mips/tx4927/common/tx4927_setup.c --- linux-2.6.0-test1/arch/mips/tx4927/common/tx4927_setup.c 2003-07-13 23:33:11.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/tx4927/common/tx4927_setup.c 2003-07-17 21:00:06.000000000 -0400 @@ -99,10 +99,10 @@ #ifdef CONFIG_KGDB { - printk("Calling breakpoint() -- start remote kgdb\n"); + printk(KERN_NOTICE "Calling breakpoint() -- start remote kgdb\n"); set_debug_traps(); breakpoint(); - printk("Calling breakpoint() -- done\n"); + printk(KERN_NOTICE "Calling breakpoint() -- done\n"); } #endif @@ -139,7 +139,7 @@ #ifdef DEBUG void print_cp0(char *key, int num, char *name, u32 val) { - printk("%s cp0:%02d:%s=0x%08x\n", key, num, name, val); + printk(KERN_DEBUG "%s cp0:%02d:%s=0x%08x\n", key, num, name, val); return; } @@ -169,7 +169,7 @@ void print_pic(char *key, u32 reg, char *name) { - printk("%s pic:0x%08x:%s=0x%08x\n", key, reg, name, + printk(KERN_NOTICE "%s pic:0x%08x:%s=0x%08x\n", key, reg, name, TX4927_RD(reg)); return; } @@ -211,7 +211,7 @@ void print_addr(char *hdr, char *key, u32 addr) { - printk("%s %s:0x%08x=0x%08x\n", hdr, key, addr, TX4927_RD(addr)); + printk(KERN_NOTICE "%s %s:0x%08x=0x%08x\n", hdr, key, addr, TX4927_RD(addr)); return; } @@ -246,6 +246,6 @@ __asm__ __volatile__("ori %0, $26, 0":"=r"(val) ); - printk("k0=[0x%08x]\n", val); + printk(KERN_NOTICE "k0=[0x%08x]\n", val); } #endif diff -urN linux-2.6.0-test1/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_pci_fixup.c linux-2.6.0-test1-printk-mips/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_pci_fixup.c --- linux-2.6.0-test1/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_pci_fixup.c 2003-07-13 23:37:34.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_pci_fixup.c 2003-07-17 20:57:59.000000000 -0400 @@ -95,7 +95,7 @@ irq--; /* 0-3 */ if (dev->bus->parent == NULL && PCI_SLOT(dev->devfn) == TX4927_PCIC_IDSEL_AD_TO_SLOT(23)) { - printk("Onboard PCI_SLOT(dev->devfn) is %d\n", + printk(KERN_NOTICE "Onboard PCI_SLOT(dev->devfn) is %d\n", PCI_SLOT(dev->devfn)); /* IDSEL=A23 is tx4927 onboard pci slot */ irq = (irq + PCI_SLOT(dev->devfn)) % 4; @@ -174,9 +174,9 @@ v2 = *(volatile u32 *) a2; if (v1) - printk("TX4927 0x%08x 0x%08x\n", a1, v1); + printk(KERN_DEBUG "TX4927 0x%08x 0x%08x\n", a1, v1); if (v2) - printk("TX4927 0x%08x 0x%08x\n", a2, v2); + printk(KERN_DEBUG "TX4927 0x%08x 0x%08x\n", a2, v2); } void do_it1(u32 base, u32 r) @@ -198,56 +198,56 @@ unsigned long j; struct pci_dev *dev; - printk("----------------------pci\n"); + printk(KERN_DEBUG "----------------------pci\n"); pci_for_each_dev(dev) { for (j = 0; j < 64; j++) { pci_read_config_dword(dev, j * 4, &id); if (id == 0) continue; printk - ("dev 0x%02x 0x%02x:0x%02x -- 0x%02x-0x%02x 0x%08x\n", + (KERN_DEBUG "dev 0x%02x 0x%02x:0x%02x -- 0x%02x-0x%02x 0x%08x\n", dev->devfn, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn), (j * 4) + 3, (j * 4), id); } - printk("dev 0x%02x \n", dev->devfn); + printk(KERN_DEBUG "dev 0x%02x \n", dev->devfn); } - printk("----------------------sdram\n"); + printk(KERN_DEBUG "----------------------sdram\n"); do_it2(0x8000, 0x00, 0x18); do_it1(0x8000, 0x40); do_it1(0x8000, 0x58); - printk("----------------------ebus\n"); + printk(KERN_DEBUG "----------------------ebus\n"); do_it2(0x9000, 0x00, 0x38); - printk("----------------------ecc\n"); + printk(KERN_DEBUG "----------------------ecc\n"); do_it2(0xa000, 0x00, 0x08); - printk("----------------------dmac\n"); + printk(KERN_DEBUG "----------------------dmac\n"); do_it2(0xb000, 0x00, 0xf8); /* b1xx */ - printk("----------------------pci\n"); + printk(KERN_DEBUG "----------------------pci\n"); /* d */ - printk("----------------------cfg\n"); + printk(KERN_DEBUG "----------------------cfg\n"); do_it2(0xe000, 0x00, 0x20); do_it1(0xe000, 0x30); do_it1(0xe000, 0x48); - printk("----------------------timers\n"); + printk(KERN_DEBUG "----------------------timers\n"); do_it2(0xf000, 0x00, 0xf0); do_it2(0xf100, 0x00, 0xf0); do_it2(0xf200, 0x00, 0xf0); - printk("----------------------serial\n"); + printk(KERN_DEBUG "----------------------serial\n"); do_it2(0xf300, 0x00, 0x20); do_it2(0xf400, 0x00, 0x20); - printk("----------------------parallel\n"); + printk(KERN_DEBUG "----------------------parallel\n"); do_it2(0xf500, 0x00, 0x0c); - printk("----------------------pic\n"); + printk(KERN_DEBUG "----------------------pic\n"); do_it2(0xf500, 0x10, 0x24); do_it2(0xf600, 0x00, 0x2c); do_it1(0xf600, 0x40); do_it1(0xf600, 0x60); do_it1(0xf600, 0x80); do_it1(0xf600, 0xa0); - printk("----------------------aclink\n"); + printk(KERN_DEBUG "----------------------aclink\n"); do_it2(0xf700, 0x00, 0xfc); - printk("----------------------done\n"); + printk(KERN_DEBUG "----------------------done\n"); } #endif diff -urN linux-2.6.0-test1/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_pci_ops.c linux-2.6.0-test1-printk-mips/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_pci_ops.c --- linux-2.6.0-test1/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_pci_ops.c 2003-07-13 23:30:37.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_pci_ops.c 2003-07-17 20:32:13.000000000 -0400 @@ -107,7 +107,7 @@ << 16); tx4927_pcicptr->pcimask |= PCI_STATUS_REC_MASTER_ABORT; code = PCIBIOS_DEVICE_NOT_FOUND; - // printk("returning PCIBIOS_DEVICE_NOT_FOUND\n"); + // printk(KERN_ERR "returning PCIBIOS_DEVICE_NOT_FOUND\n"); } return code; } @@ -148,7 +148,7 @@ retval = check_abort(flags); if (retval == PCIBIOS_DEVICE_NOT_FOUND) *val = 0xff; -//printk("CFG R1 0x%02x 0x%02x 0x%08x\n", dev->devfn, where, *val ); +//printk(KERN_DEBUG "CFG R1 0x%02x 0x%02x 0x%08x\n", dev->devfn, where, *val ); return retval; } @@ -187,7 +187,7 @@ retval = check_abort(flags); if (retval == PCIBIOS_DEVICE_NOT_FOUND) *val = 0xffff; -//printk("CFG R2 0x%02x 0x%02x 0x%08x\n", dev->devfn, where, *val ); +//printk(KERN_DEBUG "CFG R2 0x%02x 0x%02x 0x%08x\n", dev->devfn, where, *val ); return retval; } @@ -219,7 +219,7 @@ if (retval == PCIBIOS_DEVICE_NOT_FOUND) *val = 0xffffffff; -//printk("CFG R4 0x%02x 0x%02x 0x%08x\n", dev->devfn, where, *val ); +//printk(KERN_DEBUG "CFG R4 0x%02x 0x%02x 0x%08x\n", dev->devfn, where, *val ); return retval; } @@ -247,7 +247,7 @@ *(volatile u8 *) ((ulong) & tx4927_pcicptr-> g2pcfgdata | (where & 3)) = val; #endif -//printk("CFG W1 0x%02x 0x%02x 0x%08x\n", dev->devfn, where, val ); +//printk(KERN_DEBUG "CFG W1 0x%02x 0x%02x 0x%08x\n", dev->devfn, where, val ); return check_abort(flags); } @@ -278,7 +278,7 @@ *(volatile u16 *) ((ulong) & tx4927_pcicptr-> g2pcfgdata | (where & 3)) = val; #endif -//printk("CFG W2 0x%02x 0x%02x 0x%08x\n", dev->devfn, where, val ); +//printk(KERN_DEBUG "CFG W2 0x%02x 0x%02x 0x%08x\n", dev->devfn, where, val ); return check_abort(flags); } @@ -303,7 +303,7 @@ if (mkaddr(bus, dev->devfn, where, &flags)) return -1; tx4927_pcicptr->g2pcfgdata = val; -//printk("CFG W4 0x%02x 0x%02x 0x%08x\n", dev->devfn, where, val ); +//printk(KERN_DEBUG "CFG W4 0x%02x 0x%02x 0x%08x\n", dev->devfn, where, val ); return check_abort(flags); } diff -urN linux-2.6.0-test1/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c linux-2.6.0-test1-printk-mips/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c --- linux-2.6.0-test1/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c 2003-07-13 23:35:16.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c 2003-07-17 20:56:22.000000000 -0400 @@ -126,7 +126,7 @@ { \ char tmp[100]; \ sprintf( tmp, str ); \ - printk( "%s(%s:%u)::%s", __FUNCTION__, __FILE__, __LINE__, tmp ); \ + printk(KERN_DEBUG "%s(%s:%u)::%s", __FUNCTION__, __FILE__, __LINE__, tmp ); \ } #else #define TOSHIBA_RBTX4927_SETUP_DPRINTK(flag,str...) @@ -171,13 +171,13 @@ #ifdef CONFIG_PCI void tx4927_dump_pcic_settings(void) { - printk("%s pcic settings:",toshiba_name); + printk(KERN_EMERG "%s pcic settings:",toshiba_name); { int i; unsigned long *preg = (unsigned long *) tx4927_pcicptr; for (i = 0; i < sizeof(struct tx4927_pcic_reg); i += 4) { if (i % 32 == 0) - printk("\n%04x:", i); + printk(KERN_EMERG "\n%04x:", i); if (preg == &tx4927_pcicptr->g2pintack || preg == &tx4927_pcicptr->g2pspc #ifdef CONFIG_TX4927BUG_WORKAROUND @@ -185,15 +185,15 @@ || preg == &tx4927_pcicptr->g2pcfgdata #endif ) { - printk(" XXXXXXXX"); + printk(KERN_EMERG " XXXXXXXX"); preg++; continue; } - printk(" %08lx", *preg++); + printk(KERN_EMERG " %08lx", *preg++); if (preg == &tx4927_pcicptr->g2pcfgadrs) break; } - printk("\n"); + printk(KERN_EMERG "\n"); } } @@ -215,11 +215,11 @@ return; } #endif - printk("PCI error interrupt (irq 0x%x).\n", irq); - printk("pcistat:%04x, g2pstatus:%08lx, pcicstatus:%08lx\n", + printk(KERN_ERR "PCI error interrupt (irq 0x%x).\n", irq); + printk(KERN_ERR "pcistat:%04x, g2pstatus:%08lx, pcicstatus:%08lx\n", (unsigned short) (tx4927_pcicptr->pcistatus >> 16), tx4927_pcicptr->g2pstatus, tx4927_pcicptr->pcicstatus); - printk("ccfg:%08lx, tear:%02lx_%08lx\n", + printk(KERN_ERR "ccfg:%08lx, tear:%02lx_%08lx\n", (unsigned long) tx4927_ccfgptr->ccfg, (unsigned long) (tx4927_ccfgptr->tear >> 32), (unsigned long) tx4927_ccfgptr->tear); @@ -322,8 +322,8 @@ void print_pci_status(void) { - printk("PCI STATUS %lx\n", tx4927_pcicptr->pcistatus); - printk("PCIC STATUS %lx\n", tx4927_pcicptr->pcicstatus); + printk(KERN_NOTICE "PCI STATUS %lx\n", tx4927_pcicptr->pcistatus); + printk(KERN_NOTICE "PCIC STATUS %lx\n", tx4927_pcicptr->pcicstatus); } static struct pci_dev *fake_pci_dev(struct pci_channel *hose, @@ -619,7 +619,7 @@ #ifndef TX4927_SUPPORT_PCI_66 if (tx4927_ccfgptr->ccfg & TX4927_CCFG_PCI66) - printk("PCI 66 current unsupported\n"); + printk(KERN_INFO "PCI 66 current unsupported\n"); #endif mips_memory_upper = tx4927_get_mem_size() << 20; @@ -671,7 +671,7 @@ if (!called) { printk - ("TX4927 PCIC -- DID:%04x VID:%04x RID:%02x Arbiter:%s\n", + (KERN_INFO "TX4927 PCIC -- DID:%04x VID:%04x RID:%02x Arbiter:%s\n", (unsigned short) (tx4927_pcicptr->pciid >> 16), (unsigned short) (tx4927_pcicptr->pciid & 0xffff), (unsigned short) (tx4927_pcicptr->pciccrev & 0xff), @@ -680,7 +680,7 @@ "Internal"); called = 1; } - printk("%s PCIC --%s PCICLK:",toshiba_name, + printk(KERN_INFO "%s PCIC --%s PCICLK:",toshiba_name, (tx4927_ccfgptr->ccfg & TX4927_CCFG_PCI66) ? " PCI66" : ""); if (tx4927_ccfgptr->pcfg & TX4927_PCFG_PCICLKEN_ALL) { int pciclk = 0; @@ -699,7 +699,7 @@ pciclk = tx4927_cpu_clock / 6; break; } - printk("Internal(%dMHz)", pciclk / 1000000); + printk(KERN_INFO "Internal(%dMHz)", pciclk / 1000000); } else { int pciclk = 0; int pciclk_setting = *tx4927_pci_clk_ptr; @@ -717,9 +717,9 @@ pciclk = 50000000; break; } - printk("External(%dMHz)", pciclk / 1000000); + printk(KERN_INFO "External(%dMHz)", pciclk / 1000000); } - printk("\n"); + printk(KERN_INFO "\n"); @@ -811,7 +811,7 @@ if (tx4927_pcic_trdyto >= 0) { tx4927_pcicptr->g2ptocnt &= ~0xff; tx4927_pcicptr->g2ptocnt |= (tx4927_pcic_trdyto & 0xff); - //printk("%s PCIC -- TRDYTO:%02lx\n",toshiba_name, + //printk(KERN_INFO "%s PCIC -- TRDYTO:%02lx\n",toshiba_name, // tx4927_pcicptr->g2ptocnt & 0xff); } @@ -912,7 +912,7 @@ { vu32 cp0_config; - printk("CPU is %s\n", toshiba_name); + printk(KERN_INFO "CPU is %s\n", toshiba_name); TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP, "-\n"); @@ -1067,9 +1067,9 @@ PCI_VENDOR_ID, &id); if (id == 0x94601055) { tx4927_using_backplane = 1; - printk("backplane board IS installed\n"); + printk(KERN_INFO "backplane board IS installed\n"); } else { - printk("backplane board NOT installed\n"); + printk(KERN_INFO "backplane board NOT installed\n"); } } diff -urN linux-2.6.0-test1/arch/mips/vr41xx/common/giu.c linux-2.6.0-test1-printk-mips/arch/mips/vr41xx/common/giu.c --- linux-2.6.0-test1/arch/mips/vr41xx/common/giu.c 2003-07-13 23:30:36.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/vr41xx/common/giu.c 2003-07-17 16:44:25.000000000 -0400 @@ -260,7 +260,7 @@ } if (setup_irq(GIUINT_CASCADE_IRQ, &giu_cascade)) - printk("GIUINT: Can not cascade IRQ %d.\n", GIUINT_CASCADE_IRQ); + printk(KERN_WARNING "GIUINT: Can not cascade IRQ %d.\n", GIUINT_CASCADE_IRQ); if (board_irq_init) board_irq_init(); diff -urN linux-2.6.0-test1/arch/mips/vr41xx/common/icu.c linux-2.6.0-test1-printk-mips/arch/mips/vr41xx/common/icu.c --- linux-2.6.0-test1/arch/mips/vr41xx/common/icu.c 2003-07-13 23:28:56.000000000 -0400 +++ linux-2.6.0-test1-printk-mips/arch/mips/vr41xx/common/icu.c 2003-07-17 16:44:02.000000000 -0400 @@ -329,7 +329,7 @@ set_except_vector(0, vr41xx_handle_interrupt); #ifdef CONFIG_KGDB - printk("Setting debug traps - please connect the remote debugger.\n"); + printk(KERN_DEBUG "Setting debug traps - please connect the remote debugger.\n"); set_debug_traps(); breakpoint(); #endif