diff -urN linux-2.6.0-test1/arch/sparc/kernel/cpu.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/cpu.c --- linux-2.6.0-test1/arch/sparc/kernel/cpu.c 2003-07-13 23:37:31.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/cpu.c 2003-07-14 14:11:07.000000000 -0400 @@ -147,7 +147,7 @@ } if(i==NSPARCCHIPS) - printk("DEBUG: psr.impl = 0x%x psr.vers = 0x%x\n", psr_impl, + printk(KERN_DEBUG "DEBUG: psr.impl = 0x%x psr.vers = 0x%x\n", psr_impl, psr_vers); for(i = 0; i\n", + printk(KERN_INFO "Found CPU %d \n", linux_num_cpus, (unsigned long) scan, thismid); linux_num_cpus++; } @@ -63,18 +63,18 @@ (char *) &thismid, sizeof(thismid)); linux_cpus[linux_num_cpus].prom_node = node; linux_cpus[linux_num_cpus].mid = thismid; - printk("Found CPU %d \n", + printk(KERN_INFO "Found CPU %d \n", linux_num_cpus, (unsigned long) node, thismid); linux_num_cpus++; } } } if (linux_num_cpus == 0) { - printk("No CPU nodes found, cannot continue.\n"); + printk(KERN_ALERT "No CPU nodes found, cannot continue.\n"); /* Probably a sun4e, Sun is trying to trick us ;-) */ prom_halt(); } - printk("Found %d CPU prom device tree node(s).\n", linux_num_cpus); + printk(KERN_INFO "Found %d CPU prom device tree node(s).\n", linux_num_cpus); } cpu_probe(); diff -urN linux-2.6.0-test1/arch/sparc/kernel/ebus.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/ebus.c --- linux-2.6.0-test1/arch/sparc/kernel/ebus.c 2003-07-13 23:38:43.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/ebus.c 2003-07-14 14:14:08.000000000 -0400 @@ -120,7 +120,7 @@ if (dev->parent->num_irqs != 0) { dev->num_irqs = 1; dev->irqs[0] = dev->parent->irqs[0]; -/* P3 */ /* printk("EBUS: dev %s irq %d from parent\n", dev->prom_name, dev->irqs[0]); */ +/* P3 */ /* printk(KERN_NOTICE "EBUS: dev %s irq %d from parent\n", dev->prom_name, dev->irqs[0]); */ } } else { dev->num_irqs = len / sizeof(irqs[0]); @@ -129,7 +129,7 @@ * XXX Zero is a valid pin number... * This works as long as Ebus is not wired to INTA#. */ - printk("EBUS: %s got bad irq %d from PROM\n", + printk(KERN_WARNING "EBUS: %s got bad irq %d from PROM\n", dev->prom_name, irqs[0]); dev->num_irqs = 0; dev->irqs[0] = 0; @@ -213,13 +213,13 @@ dev->num_irqs = 0; if ((dev->irqs[0] = dev->bus->self->irq) != 0) { dev->num_irqs = 1; -/* P3 */ /* printk("EBUS: child %s irq %d from parent\n", dev->prom_name, dev->irqs[0]); */ +/* P3 */ /* printk(KERN_NOTICE "EBUS: child %s irq %d from parent\n", dev->prom_name, dev->irqs[0]); */ } } else { dev->num_irqs = 1; /* dev->num_irqs = len / sizeof(irqs[0]); */ if (irqs[0] == 0 || irqs[0] >= 8) { /* See above for the parent. XXX */ - printk("EBUS: %s got bad irq %d from PROM\n", + printk(KERN_WARNING "EBUS: %s got bad irq %d from PROM\n", dev->prom_name, irqs[0]); dev->num_irqs = 0; dev->irqs[0] = 0; diff -urN linux-2.6.0-test1/arch/sparc/kernel/idprom.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/idprom.c --- linux-2.6.0-test1/arch/sparc/kernel/idprom.c 2003-07-13 23:31:57.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/idprom.c 2003-07-14 06:51:59.000000000 -0400 @@ -54,11 +54,11 @@ for (i = 0; i < NUM_SUN_MACHINES; i++) { if(Sun_Machines[i].id_machtype == machtype) { if (machtype != (SM_SUN4M_OBP | 0x00)) - printk("TYPE: %s\n", Sun_Machines[i].name); + printk(KERN_INFO "TYPE: %s\n", Sun_Machines[i].name); else { prom_getproperty(prom_root_node, "banner-name", sysname, sizeof(sysname)); - printk("TYPE: %s\n", sysname); + printk(KERN_INFO "TYPE: %s\n", sysname); } return; } @@ -99,7 +99,7 @@ display_system_type(idprom->id_machtype); - printk("Ethernet address: %x:%x:%x:%x:%x:%x\n", + printk(KERN_INFO "Ethernet address: %x:%x:%x:%x:%x:%x\n", idprom->id_ethaddr[0], idprom->id_ethaddr[1], idprom->id_ethaddr[2], idprom->id_ethaddr[3], idprom->id_ethaddr[4], idprom->id_ethaddr[5]); diff -urN linux-2.6.0-test1/arch/sparc/kernel/ioport.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/ioport.c --- linux-2.6.0-test1/arch/sparc/kernel/ioport.c 2003-07-13 23:38:52.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/ioport.c 2003-07-14 14:16:49.000000000 -0400 @@ -120,7 +120,7 @@ struct resource *res; if ((res = _sparc_find_resource(&sparc_iomap, vaddr)) == NULL) { - printk("free_io/iounmap: cannot free %lx\n", vaddr); + printk(KERN_ERR "free_io/iounmap: cannot free %lx\n", vaddr); return; } _sparc_free_io(res); @@ -168,7 +168,7 @@ res = &xres->xres; } else { if (!printed_full) { - printk("ioremap: done with statics, switching to malloc\n"); + printk(KERN_NOTICE "ioremap: done with statics, switching to malloc\n"); printed_full = 1; } tlen = strlen(name); @@ -183,7 +183,7 @@ res->name = tack; va = _sparc_ioremap(res, busno, phys, size); - /* printk("ioremap(0x%x:%08lx[0x%lx])=%p\n", busno, phys, size, va); */ /* P3 diag */ + /* printk(KERN_DEBUG "ioremap(0x%x:%08lx[0x%lx])=%p\n", busno, phys, size, va); */ /* P3 diag */ return va; } @@ -225,7 +225,7 @@ #ifdef CONFIG_SBUS void sbus_set_sbus64(struct sbus_dev *sdev, int x) { - printk("sbus_set_sbus64: unsupported\n"); + printk(KERN_WARNING "sbus_set_sbus64: unsupported\n"); } /* @@ -261,7 +261,7 @@ if (allocate_resource(&_sparc_dvma, res, len_total, _sparc_dvma.start, _sparc_dvma.end, PAGE_SIZE, NULL, NULL) != 0) { - printk("sbus_alloc_consistent: cannot occupy 0x%lx", len_total); + printk(KERN_ERR "sbus_alloc_consistent: cannot occupy 0x%lx", len_total); goto err_nova; } mmu_inval_dma_area(va, len_total); @@ -293,18 +293,18 @@ if ((res = _sparc_find_resource(&_sparc_dvma, (unsigned long)p)) == NULL) { - printk("sbus_free_consistent: cannot free %p\n", p); + printk(KERN_ERR "sbus_free_consistent: cannot free %p\n", p); return; } if (((unsigned long)p & (PAGE_SIZE-1)) != 0) { - printk("sbus_free_consistent: unaligned va %p\n", p); + printk(KERN_ERR "sbus_free_consistent: unaligned va %p\n", p); return; } n = (n + PAGE_SIZE-1) & PAGE_MASK; if ((res->end-res->start)+1 != n) { - printk("sbus_free_consistent: region 0x%lx asked 0x%lx\n", + printk(KERN_ERR "sbus_free_consistent: region 0x%lx asked 0x%lx\n", (long)((res->end-res->start)+1), n); return; } @@ -382,7 +382,7 @@ void sbus_dma_sync_sg(struct sbus_dev *sdev, struct scatterlist *sg, int n, int direction) { - printk("sbus_dma_sync_sg: not implemented yet\n"); + printk(KERN_WARNING "sbus_dma_sync_sg: not implemented yet\n"); } #endif /* CONFIG_SBUS */ @@ -408,27 +408,27 @@ order = get_order(len_total); va = __get_free_pages(GFP_KERNEL, order); if (va == 0) { - printk("pci_alloc_consistent: no %ld pages\n", len_total>>PAGE_SHIFT); + printk(KERN_ERR "pci_alloc_consistent: no %ld pages\n", len_total>>PAGE_SHIFT); return NULL; } if ((res = kmalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) { free_pages(va, order); - printk("pci_alloc_consistent: no core\n"); + printk(KERN_ERR "pci_alloc_consistent: no core\n"); return NULL; } memset((char*)res, 0, sizeof(struct resource)); if (allocate_resource(&_sparc_dvma, res, len_total, _sparc_dvma.start, _sparc_dvma.end, PAGE_SIZE, NULL, NULL) != 0) { - printk("pci_alloc_consistent: cannot occupy 0x%lx", len_total); + printk(KERN_ERR "pci_alloc_consistent: cannot occupy 0x%lx", len_total); free_pages(va, order); kfree(res); return NULL; } mmu_inval_dma_area(va, len_total); #if 0 -/* P3 */ printk("pci_alloc_consistent: kva %lx uncva %lx phys %lx size %lx\n", +/* P3 */ printk(KERN_DEBUG "pci_alloc_consistent: kva %lx uncva %lx phys %lx size %lx\n", (long)va, (long)res->start, (long)virt_to_phys(va), len_total); #endif sparc_mapiorange(0, virt_to_phys(va), res->start, len_total); @@ -452,18 +452,18 @@ if ((res = _sparc_find_resource(&_sparc_dvma, (unsigned long)p)) == NULL) { - printk("pci_free_consistent: cannot free %p\n", p); + printk(KERN_ERR "pci_free_consistent: cannot free %p\n", p); return; } if (((unsigned long)p & (PAGE_SIZE-1)) != 0) { - printk("pci_free_consistent: unaligned va %p\n", p); + printk(KERN_ERR "pci_free_consistent: unaligned va %p\n", p); return; } n = (n + PAGE_SIZE-1) & PAGE_MASK; if ((res->end-res->start)+1 != n) { - printk("pci_free_consistent: region 0x%lx asked 0x%lx\n", + printk(KERN_ERR "pci_free_consistent: region 0x%lx asked 0x%lx\n", (long)((res->end-res->start)+1), (long)n); return; } diff -urN linux-2.6.0-test1/arch/sparc/kernel/irq.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/irq.c --- linux-2.6.0-test1/arch/sparc/kernel/irq.c 2003-07-13 23:29:30.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/irq.c 2003-07-14 06:51:59.000000000 -0400 @@ -158,11 +158,11 @@ cpu_irq = irq & (NR_IRQS - 1); action = *(cpu_irq + irq_action); if (cpu_irq > 14) { /* 14 irq levels on the sparc */ - printk("Trying to free bogus IRQ %d\n", irq); + printk(KERN_WARNING "Trying to free bogus IRQ %d\n", irq); return; } if (!action->handler) { - printk("Trying to free free IRQ%d\n",irq); + printk(KERN_WARNING "Trying to free free IRQ%d\n",irq); return; } if (dev_id) { @@ -172,11 +172,11 @@ tmp = action; } if (!action) { - printk("Trying to free free shared IRQ%d\n",irq); + printk(KERN_WARNING "Trying to free free shared IRQ%d\n",irq); return; } } else if (action->flags & SA_SHIRQ) { - printk("Trying to free shared IRQ%d with NULL device ID\n", irq); + printk(KERN_WARNING "Trying to free shared IRQ%d with NULL device ID\n", irq); return; } if (action->flags & SA_STATIC_ALLOC) @@ -184,7 +184,7 @@ /* This interrupt is marked as specially allocated * so it is a bad idea to free it. */ - printk("Attempt to free statically allocated IRQ%d (%s)\n", + printk(KERN_WARNING "Attempt to free statically allocated IRQ%d (%s)\n", irq, action->name); return; } @@ -219,19 +219,19 @@ int cpu = smp_processor_id(); int i; - printk("\n%s, CPU %d:\n", str, cpu); - printk("irq: %d [ ", irqs_running()); + printk(KERN_INFO "\n%s, CPU %d:\n", str, cpu); + printk(KERN_INFO "irq: %d [ ", irqs_running()); for (i = 0; i < NR_CPUS; i++) { if (cpu_online(i)) - printk("%u ", __brlock_array[i][BR_GLOBALIRQ_LOCK]); + printk(KERN_INFO "%u ", __brlock_array[i][BR_GLOBALIRQ_LOCK]); } - printk("]\nbh: %d [ ", + printk(KERN_INFO "]\nbh: %d [ ", (spin_is_locked(&global_bh_lock) ? 1 : 0)); for (i = 0; i < NR_CPUS; i++) { if (cpu_online(i)) - printk("%u ", local_bh_count(i)); + printk(KERN_INFO "%u ", local_bh_count(i)); } - printk("]\n"); + printk(KERN_INFO "]\n"); #ifdef VERBOSE_DEBUG_IRQLOCK smp_show_backtrace_all_cpus(); @@ -381,7 +381,7 @@ { unsigned long pc; __asm__ __volatile__("mov %%i7, %0" : "=r" (pc)); - printk("global_restore_flags: Bogon flags(%08lx) caller %08lx\n", flags, pc); + printk(KERN_INFO "global_restore_flags: Bogon flags(%08lx) caller %08lx\n", flags, pc); } } } @@ -397,17 +397,17 @@ cpu_irq = irq & (NR_IRQS - 1); action = *(cpu_irq + irq_action); - printk("IO device interrupt, irq = %d\n", irq); - printk("PC = %08lx NPC = %08lx FP=%08lx\n", regs->pc, + printk(KERN_EMERG "IO device interrupt, irq = %d\n", irq); + printk(KERN_EMERG "PC = %08lx NPC = %08lx FP=%08lx\n", regs->pc, regs->npc, regs->u_regs[14]); if (action) { - printk("Expecting: "); + printk(KERN_EMERG "Expecting: "); for (i = 0; i < 16; i++) if (action->handler) - printk("[%s:%d:0x%x] ", action->name, + printk(KERN_EMERG "[%s:%d:0x%x] ", action->name, (int) i, (unsigned int) action->handler); } - printk("AIEEE\n"); + printk(KERN_EMERG "AIEEE\n"); panic("bogus interrupt received"); } @@ -485,7 +485,7 @@ panic("Trying to register fast irq as shared.\n"); /* Anyway, someone already owns it so cannot be made fast. */ - printk("request_fast_irq: Trying to register yet already owned.\n"); + printk(KERN_ERR "request_fast_irq: Trying to register yet already owned.\n"); return -EBUSY; } @@ -498,7 +498,7 @@ if (static_irq_count < MAX_STATIC_ALLOC) action = &static_irqaction[static_irq_count++]; else - printk("Fast IRQ%d (%s) SA_STATIC_ALLOC failed using kmalloc\n", + printk(KERN_ERR "Fast IRQ%d (%s) SA_STATIC_ALLOC failed using kmalloc\n", irq, devname); } @@ -577,7 +577,7 @@ return -EBUSY; } if ((action->flags & SA_INTERRUPT) ^ (irqflags & SA_INTERRUPT)) { - printk("Attempt to mix fast and slow interrupts on IRQ%d denied\n", irq); + printk(KERN_ERR "Attempt to mix fast and slow interrupts on IRQ%d denied\n", irq); return -EBUSY; } action = NULL; /* Or else! */ @@ -592,7 +592,7 @@ if (static_irq_count < MAX_STATIC_ALLOC) action = &static_irqaction[static_irq_count++]; else - printk("Request for IRQ%d (%s) SA_STATIC_ALLOC failed using kmalloc\n",irq, devname); + printk(KERN_ERR "Request for IRQ%d (%s) SA_STATIC_ALLOC failed using kmalloc\n",irq, devname); } if (action == NULL) diff -urN linux-2.6.0-test1/arch/sparc/kernel/module.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/module.c --- linux-2.6.0-test1/arch/sparc/kernel/module.c 2003-07-13 23:28:54.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/module.c 2003-07-14 06:51:59.000000000 -0400 @@ -49,7 +49,7 @@ for (symidx = 0; sechdrs[symidx].sh_type != SHT_SYMTAB; symidx++) { if (symidx == hdr->e_shnum-1) { - printk("%s: no symtab found.\n", mod->name); + printk(KERN_ERR "%s: no symtab found.\n", mod->name); return -ENOEXEC; } } diff -urN linux-2.6.0-test1/arch/sparc/kernel/pcic.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/pcic.c --- linux-2.6.0-test1/arch/sparc/kernel/pcic.c 2003-07-13 23:34:38.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/pcic.c 2003-07-14 06:51:59.000000000 -0400 @@ -383,7 +383,7 @@ /* * We do not panic here for the sake of embedded systems. */ - printk("PCIC: System %s is unknown, cannot route interrupts\n", + printk(KERN_CRIT "PCIC: System %s is unknown, cannot route interrupts\n", namebuf); } @@ -523,7 +523,7 @@ * board in a PCI slot. We must remap it * under 64K but it is not done yet. XXX */ - printk("PCIC: Skipping I/O space at 0x%lx," + printk(KERN_ALERT "PCIC: Skipping I/O space at 0x%lx," "this will Oops if a driver attaches;" "device '%s' at %02x:%02x)\n", address, namebuf, dev->bus->number, dev->devfn); @@ -555,7 +555,7 @@ p++; } if (i >= pcic->pcic_imdim) { - printk("PCIC: device %s devfn %02x:%02x not found in %d\n", + printk(KERN_ERR "PCIC: device %s devfn %02x:%02x not found in %d\n", namebuf, dev->bus->number, dev->devfn, pcic->pcic_imdim); dev->irq = 0; return; @@ -569,9 +569,9 @@ ivec = readw(pcic->pcic_regs+PCI_INT_SELECT_HI); dev->irq = ivec >> ((i-4) << 2) & 0xF; } else { /* Corrupted map */ - printk("PCIC: BAD PIN %d\n", i); for (;;) {} + printk(KERN_ERR "PCIC: BAD PIN %d\n", i); for (;;) {} } -/* P3 */ /* printk("PCIC: device %s pin %d ivec 0x%x irq %x\n", namebuf, i, ivec, dev->irq); */ +/* P3 */ /* printk(KERN_NOTICE "PCIC: device %s pin %d ivec 0x%x irq %x\n", namebuf, i, ivec, dev->irq); */ /* * dev->irq=0 means PROM did not bother to program the upper @@ -579,9 +579,9 @@ */ if (dev->irq == 0 || p->force) { if (p->irq == 0 || p->irq >= 15) { /* Corrupted map */ - printk("PCIC: BAD IRQ %d\n", p->irq); for (;;) {} + printk(KERN_ERR "PCIC: BAD IRQ %d\n", p->irq); for (;;) {} } - printk("PCIC: setting irq %d at pin %d for device %02x:%02x\n", + printk(KERN_NOTICE "PCIC: setting irq %d at pin %d for device %02x:%02x\n", p->irq, p->pin, dev->bus->number, dev->devfn); dev->irq = p->irq; @@ -616,7 +616,7 @@ struct pcidev_cookie *pcp; if (!pcic0_up) { - printk("pcibios_fixup_bus: no PCIC\n"); + printk(KERN_ERR "pcibios_fixup_bus: no PCIC\n"); return; } pcic = &pcic0; @@ -625,7 +625,7 @@ * Next crud is an equivalent of pbm = pcic_bus_to_pbm(bus); */ if (bus->number != 0) { - printk("pcibios_fixup_bus: nonzero bus 0x%x\n", bus->number); + printk(KERN_ERR "pcibios_fixup_bus: nonzero bus 0x%x\n", bus->number); return; } @@ -651,14 +651,14 @@ } pcic_read_config(dev->bus, dev->devfn, PCI_COMMAND, 2, &cmd); if (has_io && !(cmd & PCI_COMMAND_IO)) { - printk("PCIC: Enabling I/O for device %02x:%02x\n", + printk(KERN_NOTICE "PCIC: Enabling I/O for device %02x:%02x\n", dev->bus->number, dev->devfn); cmd |= PCI_COMMAND_IO; pcic_write_config(dev->bus, dev->devfn, PCI_COMMAND, 2, cmd); } if (has_mem && !(cmd & PCI_COMMAND_MEMORY)) { - printk("PCIC: Enabling memory for device %02x:%02x\n", + printk(KERN_NOTICE "PCIC: Enabling memory for device %02x:%02x\n", dev->bus->number, dev->devfn); cmd |= PCI_COMMAND_MEMORY; pcic_write_config(dev->bus, dev->devfn, @@ -700,10 +700,10 @@ ivec = readw(pcic->pcic_regs+PCI_INT_SELECT_HI); irq = ivec >> ((pin-4) << 2) & 0xF; } else { /* Corrupted map */ - printk("PCIC: BAD PIN %d FOR %s\n", pin, name); + printk(KERN_ERR "PCIC: BAD PIN %d FOR %s\n", pin, name); for (;;) {} /* XXX Cannot panic properly in case of PROLL */ } -/* P3 */ /* printk("PCIC: dev %s pin %d ivec 0x%x irq %x\n", name, pin, ivec, irq); */ +/* P3 */ /* printk(KERN_NOTICE "PCIC: dev %s pin %d ivec 0x%x irq %x\n", name, pin, ivec, irq); */ return irq; } @@ -874,7 +874,7 @@ * XXX On CP-1200 PCI #SERR may happen, we do not know * what to do about it yet. */ - printk("Aiee, NMI pend 0x%x pc 0x%x spec %d, hanging\n", + printk(KERN_CRIT "Aiee, NMI pend 0x%x pc 0x%x spec %d, hanging\n", pend, (int)regs->pc, pcic_speculative); for (;;) { } } @@ -918,12 +918,12 @@ static void pcic_clear_profile_irq(int cpu) { - printk("PCIC: unimplemented code: FILE=%s LINE=%d", __FILE__, __LINE__); + printk(KERN_WARNING "PCIC: unimplemented code: FILE=%s LINE=%d", __FILE__, __LINE__); } static void pcic_load_profile_irq(int cpu, unsigned int limit) { - printk("PCIC: unimplemented code: FILE=%s LINE=%d", __FILE__, __LINE__); + printk(KERN_WARNING "PCIC: unimplemented code: FILE=%s LINE=%d", __FILE__, __LINE__); } /* We assume the caller is local cli()'d when these are called, or else diff -urN linux-2.6.0-test1/arch/sparc/kernel/process.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/process.c --- linux-2.6.0-test1/arch/sparc/kernel/process.c 2003-07-13 23:30:47.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/process.c 2003-07-14 06:51:59.000000000 -0400 @@ -104,7 +104,7 @@ fps = (fps + (faults - last_faults)) >> 1; last_faults = faults; #if 0 - printk("kernel faults / second = %ld\n", fps); + printk(KERN_INFO "kernel faults / second = %ld\n", fps); #endif if (fps >= SUN4C_FAULT_HIGH) { sun4c_grow_kernel_ring(); @@ -199,7 +199,7 @@ rw = (struct reg_window *)fp; while(rw && (((unsigned long) rw) >= PAGE_OFFSET) && !(((unsigned long) rw) & 0x7)) { - printk("CPU[%d]: ARGS[%08lx,%08lx,%08lx,%08lx,%08lx,%08lx] " + printk(KERN_NOTICE "CPU[%d]: ARGS[%08lx,%08lx,%08lx,%08lx,%08lx,%08lx] " "FP[%08lx] CALLER[%08lx]\n", cpu, rw->ins[0], rw->ins[1], rw->ins[2], rw->ins[3], rw->ins[4], rw->ins[5], @@ -243,15 +243,15 @@ unsigned long *stk; int i; - printk("l0: %08lx l1: %08lx l2: %08lx l3: %08lx " + printk(KERN_EMERG "l0: %08lx l1: %08lx l2: %08lx l3: %08lx " "l4: %08lx l5: %08lx l6: %08lx l7: %08lx\n", sf->locals[0], sf->locals[1], sf->locals[2], sf->locals[3], sf->locals[4], sf->locals[5], sf->locals[6], sf->locals[7]); - printk("i0: %08lx i1: %08lx i2: %08lx i3: %08lx " + printk(KERN_EMERG "i0: %08lx i1: %08lx i2: %08lx i3: %08lx " "i4: %08lx i5: %08lx fp: %08lx i7: %08lx\n", sf->ins[0], sf->ins[1], sf->ins[2], sf->ins[3], sf->ins[4], sf->ins[5], (unsigned long)sf->fp, sf->callers_pc); - printk("sp: %08lx x0: %08lx x1: %08lx x2: %08lx " + printk(KERN_EMERG "sp: %08lx x0: %08lx x1: %08lx x2: %08lx " "x3: %08lx x4: %08lx x5: %08lx xx: %08lx\n", (unsigned long)sf->structptr, sf->xargs[0], sf->xargs[1], sf->xargs[2], sf->xargs[3], sf->xargs[4], sf->xargs[5], @@ -261,7 +261,7 @@ stk = (unsigned long *)((unsigned long)sf + STACKFRAME_SZ); i = 0; do { - printk("s%d: %08lx\n", i++, *stk++); + printk(KERN_EMERG "s%d: %08lx\n", i++, *stk++); } while ((size -= sizeof(unsigned long))); } #endif @@ -270,19 +270,19 @@ { struct reg_window *rw = (struct reg_window *) r->u_regs[14]; - printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n", + printk(KERN_EMERG "PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n", r->psr, r->pc, r->npc, r->y, print_tainted()); - printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", + printk(KERN_EMERG "%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3], r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]); - printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", + printk(KERN_EMERG "%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11], r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]); - printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", + printk(KERN_EMERG "%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3], rw->locals[4], rw->locals[5], rw->locals[6], rw->locals[7]); - printk("%%I: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", + printk(KERN_EMERG "%%I: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", rw->ins[0], rw->ins[1], rw->ins[2], rw->ins[3], rw->ins[4], rw->ins[5], rw->ins[6], rw->ins[7]); } @@ -311,10 +311,10 @@ break; rw = (struct reg_window *) fp; pc = rw->ins[7]; - printk("[%08lx] ", pc); + printk(KERN_EMERG "[%08lx] ", pc); fp = rw->ins[6]; } while (++count < 16); - printk("\n"); + printk(KERN_EMERG "\n"); } /* @@ -516,7 +516,7 @@ parentstack = (struct sparc_stackf *) regs->u_regs[UREG_FP]; #if 0 - printk("clone: parent stack:\n"); + printk(KERN_NOTICE "clone: parent stack:\n"); show_stackframe(parentstack); #endif @@ -525,7 +525,7 @@ return -EFAULT; #if 0 - printk("clone: child stack:\n"); + printk(KERN_NOTICE "clone: child stack:\n"); show_stackframe(childstack); #endif diff -urN linux-2.6.0-test1/arch/sparc/kernel/ptrace.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/ptrace.c --- linux-2.6.0-test1/arch/sparc/kernel/ptrace.c 2003-07-13 23:39:21.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/ptrace.c 2003-07-14 14:17:57.000000000 -0400 @@ -151,7 +151,7 @@ /* Rest of them are completely unsupported. */ default: - printk("%s [%d]: Wants to read user offset %ld\n", + printk(KERN_ERR "%s [%d]: Wants to read user offset %ld\n", current->comm, current->pid, offset); pt_error_return(regs, EIO); return; @@ -218,7 +218,7 @@ /* Rest of them are completely unsupported or "no-touch". */ default: - printk("%s [%d]: Wants to write user offset %ld\n", + printk(KERN_ERR "%s [%d]: Wants to write user offset %ld\n", current->comm, current->pid, offset); goto failure; } @@ -276,10 +276,10 @@ s = "unknown"; if (request == PTRACE_POKEDATA && data == 0x91d02001){ - printk ("do_ptrace: breakpoint pid=%d, addr=%08lx addr2=%08lx\n", + printk (KERN_DEBUG "do_ptrace: breakpoint pid=%d, addr=%08lx addr2=%08lx\n", pid, addr, addr2); } else - printk("do_ptrace: rq=%s(%d) pid=%d addr=%08lx data=%08lx addr2=%08lx\n", + printk(KERN_DEBUG "do_ptrace: rq=%s(%d) pid=%d addr=%08lx data=%08lx addr2=%08lx\n", s, (int) request, (int) pid, addr, data, addr2); } #endif @@ -385,7 +385,7 @@ __put_user(cregs->u_regs[rval], (&pregs->u_regs[rval - 1])); pt_succ_return(regs, 0); #ifdef DEBUG_PTRACE - printk ("PC=%x nPC=%x o7=%x\n", cregs->pc, cregs->npc, cregs->u_regs [15]); + printk (KERN_DEBUG "PC=%x nPC=%x o7=%x\n", cregs->pc, cregs->npc, cregs->u_regs [15]); #endif goto out_tsk; } @@ -531,8 +531,8 @@ goto out_tsk; } #ifdef DEBUG_PTRACE - printk ("Original: %08lx %08lx\n", child->thread.kregs->pc, child->thread.kregs->npc); - printk ("Continuing with %08lx %08lx\n", addr, addr+4); + printk (KERN_DEBUG "Original: %08lx %08lx\n", child->thread.kregs->pc, child->thread.kregs->npc); + printk (KERN_DEBUG "Continuing with %08lx %08lx\n", addr, addr+4); #endif child->thread.kregs->pc = addr; child->thread.kregs->npc = addr + 4; @@ -545,7 +545,7 @@ child->exit_code = data; #ifdef DEBUG_PTRACE - printk("CONT: %s [%d]: set exit_code = %x %lx %lx\n", + printk(KERN_DEBUG "CONT: %s [%d]: set exit_code = %x %lx %lx\n", child->comm, child->pid, child->exit_code, child->thread.kregs->pc, child->thread.kregs->npc); @@ -602,7 +602,7 @@ asmlinkage void syscall_trace(void) { #ifdef DEBUG_PTRACE - printk("%s [%d]: syscall_trace\n", current->comm, current->pid); + printk(KERN_DEBUG "%s [%d]: syscall_trace\n", current->comm, current->pid); #endif if (!test_thread_flag(TIF_SYSCALL_TRACE)) return; @@ -620,7 +620,7 @@ * stopping signal is not SIGTRAP. -brl */ #ifdef DEBUG_PTRACE - printk("%s [%d]: syscall_trace exit= %x\n", current->comm, + printk(KERN_DEBUG "%s [%d]: syscall_trace exit= %x\n", current->comm, current->pid, current->exit_code); #endif if (current->exit_code) { diff -urN linux-2.6.0-test1/arch/sparc/kernel/setup.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/setup.c --- linux-2.6.0-test1/arch/sparc/kernel/setup.c 2003-07-13 23:29:22.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/setup.c 2003-07-14 06:51:59.000000000 -0400 @@ -127,7 +127,7 @@ int obp_system_intr(void) { if (boot_flags & BOOTME_DEBUG) { - printk("OBP: system interrupted\n"); + printk(KERN_EMERG "OBP: system interrupted\n"); prom_halt(); return 1; } @@ -156,7 +156,7 @@ register_console(&prom_debug_console); break; default: - printk("Unknown boot switch (-%c)\n", c); + printk(KERN_WARNING "Unknown boot switch (-%c)\n", c); break; } } @@ -269,28 +269,28 @@ prom_halt(); } #endif - printk("ARCH: "); + printk(KERN_INFO "ARCH: "); switch(sparc_cpu_model) { case sun4: - printk("SUN4\n"); + printk(KERN_INFO "SUN4\n"); break; case sun4c: - printk("SUN4C\n"); + printk(KERN_INFO "SUN4C\n"); break; case sun4m: - printk("SUN4M\n"); + printk(KERN_INFO "SUN4M\n"); break; case sun4d: - printk("SUN4D\n"); + printk(KERN_INFO "SUN4D\n"); break; case sun4e: - printk("SUN4E\n"); + printk(KERN_INFO "SUN4E\n"); break; case sun4u: - printk("SUN4U\n"); + printk(KERN_INFO "SUN4U\n"); break; default: - printk("UNKNOWN!\n"); + printk(KERN_INFO "UNKNOWN!\n"); break; }; @@ -361,7 +361,7 @@ if((boot_flags&BOOTME_DEBUG) && (linux_dbvec!=0) && ((*(short *)linux_dbvec) != -1)) { - printk("Booted under KADB. Syncing trap table.\n"); + printk(KERN_NOTICE "Booted under KADB. Syncing trap table.\n"); (*(linux_dbvec->teach_debugger))(); } @@ -453,7 +453,7 @@ if (!stop_a_enabled) return; - printk("\n"); + printk(KERN_WARNING "\n"); flush_user_windows(); prom_cmdline(); diff -urN linux-2.6.0-test1/arch/sparc/kernel/smp.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/smp.c --- linux-2.6.0-test1/arch/sparc/kernel/smp.c 2003-07-13 23:32:32.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/smp.c 2003-07-14 06:51:59.000000000 -0400 @@ -111,7 +111,7 @@ void cpu_panic(void) { - printk("CPU[%d]: Returns from cpu_idle!\n", smp_processor_id()); + printk(KERN_EMERG "CPU[%d]: Returns from cpu_idle!\n", smp_processor_id()); panic("SMP bolixed\n"); } diff -urN linux-2.6.0-test1/arch/sparc/kernel/sun4d_irq.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/sun4d_irq.c --- linux-2.6.0-test1/arch/sparc/kernel/sun4d_irq.c 2003-07-13 23:28:52.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/sun4d_irq.c 2003-07-14 06:51:59.000000000 -0400 @@ -143,7 +143,7 @@ actionp = &(sbus_actions[irq - (1 << 5)].action); action = *actionp; if (!action) { - printk("Trying to free free IRQ%d\n",irq); + printk(KERN_NOTICE "Trying to free free IRQ%d\n",irq); return; } if (dev_id) { @@ -153,11 +153,11 @@ tmp = action; } if (!action) { - printk("Trying to free free shared IRQ%d\n",irq); + printk(KERN_NOTICE "Trying to free free shared IRQ%d\n",irq); return; } } else if (action->flags & SA_SHIRQ) { - printk("Trying to free shared IRQ%d with NULL device ID\n", irq); + printk(KERN_NOTICE "Trying to free shared IRQ%d with NULL device ID\n", irq); return; } if (action->flags & SA_STATIC_ALLOC) @@ -165,7 +165,7 @@ /* This interrupt is marked as specially allocated * so it is a bad idea to free it. */ - printk("Attempt to free statically allocated IRQ%d (%s)\n", + printk(KERN_NOTICE "Attempt to free statically allocated IRQ%d (%s)\n", irq, action->name); return; } @@ -287,7 +287,7 @@ return -EBUSY; } if ((action->flags & SA_INTERRUPT) ^ (irqflags & SA_INTERRUPT)) { - printk("Attempt to mix fast and slow interrupts on IRQ%d denied\n", irq); + printk(KERN_WARNING "Attempt to mix fast and slow interrupts on IRQ%d denied\n", irq); return -EBUSY; } action = NULL; /* Or else! */ @@ -302,7 +302,7 @@ if (static_irq_count < MAX_STATIC_ALLOC) action = &static_irqaction[static_irq_count++]; else - printk("Request for IRQ%d (%s) SA_STATIC_ALLOC failed using kmalloc\n",irq, devname); + printk(KERN_WARNING "Request for IRQ%d (%s) SA_STATIC_ALLOC failed using kmalloc\n",irq, devname); } if (action == NULL) @@ -411,7 +411,7 @@ sbus_serving_map &= ~(1 << i); } for_each_sbus(sbus) { - printk("sbus%d IRQs directed to CPU%d\n", sbus->board, sbus_tid[sbus->board]); + printk(KERN_NOTICE "sbus%d IRQs directed to CPU%d\n", sbus->board, sbus_tid[sbus->board]); set_sbi_tid(sbus->devid, sbus_tid[sbus->board] << 3); } #else @@ -424,7 +424,7 @@ sbus_tid[sbus->board] = cpuid; set_sbi_tid(sbus->devid, cpuid << 3); } - printk("All sbus IRQs directed to CPU%d\n", cpuid); + printk(KERN_NOTICE "All sbus IRQs directed to CPU%d\n", cpuid); #endif } #endif @@ -529,7 +529,7 @@ /* Get rid of pending irqs from PROM */ mask = acquire_sbi(sbus->devid, 0xffffffff); if (mask) { - printk ("Clearing pending IRQs %08x on SBI %d\n", mask, sbus->board); + printk (KERN_NOTICE "Clearing pending IRQs %08x on SBI %d\n", mask, sbus->board); release_sbi(sbus->devid, mask); } } diff -urN linux-2.6.0-test1/arch/sparc/kernel/sun4d_smp.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/sun4d_smp.c --- linux-2.6.0-test1/arch/sparc/kernel/sun4d_smp.c 2003-07-13 23:30:41.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/sun4d_smp.c 2003-07-14 06:51:59.000000000 -0400 @@ -172,7 +172,7 @@ int cpucount = 0; int i = 0; - printk("Entering SMP Mode...\n"); + printk(KERN_INFO "Entering SMP Mode...\n"); for (i = 0; i < NR_CPUS; i++) cpu_offset[i] = (char *)&cpu_data[i] - (char *)&cpu_data; @@ -184,7 +184,7 @@ cpu_present_map = 0; for(i=0; i < linux_num_cpus; i++) cpu_present_map |= (1<id_machtype) { case (SM_SUN4 | SM_4_260 ): - printk("Setup for a SUN4/260\n"); + printk(KERN_INFO "Setup for a SUN4/260\n"); sun4_memreg_physaddr=SUN4_200_MEMREG_PHYSADDR; sun4_clock_physaddr=SUN4_200_CLOCK_PHYSADDR; sun4_timer_physaddr=SUN4_UNUSED_PHYSADDR; @@ -47,7 +47,7 @@ sun4_esp_physaddr=SUN4_UNUSED_PHYSADDR; break; case (SM_SUN4 | SM_4_330 ): - printk("Setup for a SUN4/330\n"); + printk(KERN_INFO "Setup for a SUN4/330\n"); sun4_memreg_physaddr=SUN4_300_MEMREG_PHYSADDR; sun4_clock_physaddr=SUN4_300_CLOCK_PHYSADDR; sun4_timer_physaddr=SUN4_300_TIMER_PHYSADDR; @@ -58,7 +58,7 @@ sun4_esp_physaddr=SUN4_300_ESP_PHYSADDR; break; case (SM_SUN4 | SM_4_470 ): - printk("Setup for a SUN4/470\n"); + printk(KERN_INFO "Setup for a SUN4/470\n"); sun4_memreg_physaddr=SUN4_400_MEMREG_PHYSADDR; sun4_clock_physaddr=SUN4_400_CLOCK_PHYSADDR; sun4_timer_physaddr=SUN4_400_TIMER_PHYSADDR; diff -urN linux-2.6.0-test1/arch/sparc/kernel/sunos_ioctl.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/sunos_ioctl.c --- linux-2.6.0-test1/arch/sparc/kernel/sunos_ioctl.c 2003-07-13 23:38:01.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/sunos_ioctl.c 2003-07-14 14:13:08.000000000 -0400 @@ -166,7 +166,7 @@ case _IOW('i', 57, struct ifreq): /* SIOCFDEXUSER */ case _IOW('i', 58, struct ifreq): /* SIOCFDGNETMAP */ case _IOW('i', 59, struct ifreq): /* SIOCFDGIOCTL */ - printk("FDDI ioctl, returning EOPNOTSUPP\n"); + printk(KERN_ERR "FDDI ioctl, returning EOPNOTSUPP\n"); ret = -EOPNOTSUPP; goto out; @@ -218,7 +218,7 @@ #if 0 if ((cmd & 0xff00) == ('k' << 8)) { - printk ("[[KBIO: %8.8x\n", (unsigned int) cmd); + printk (KERN_DEBUG "[[KBIO: %8.8x\n", (unsigned int) cmd); } #endif diff -urN linux-2.6.0-test1/arch/sparc/kernel/sys_sunos.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/sys_sunos.c --- linux-2.6.0-test1/arch/sparc/kernel/sys_sunos.c 2003-07-13 23:33:14.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/sys_sunos.c 2003-07-14 06:51:59.000000000 -0400 @@ -73,7 +73,7 @@ if(flags & MAP_NORESERVE) { static int cnt; if (cnt++ < 10) - printk("%s: unimplemented SunOS MAP_NORESERVE mmap() flag\n", + printk(KERN_WARNING "%s: unimplemented SunOS MAP_NORESERVE mmap() flag\n", current->comm); flags &= ~MAP_NORESERVE; } @@ -236,7 +236,7 @@ asmlinkage unsigned long sunos_sstk(int increment) { lock_kernel(); - printk("%s: Call to sunos_sstk(increment<%d>) is unsupported\n", + printk(KERN_ERR "%s: Call to sunos_sstk(increment<%d>) is unsupported\n", current->comm, increment); unlock_kernel(); return -1; @@ -260,7 +260,7 @@ { /* I wanna see who uses this... */ lock_kernel(); - printk("%s: Advises us to use %s paging strategy\n", + printk(KERN_ERR "%s: Advises us to use %s paging strategy\n", current->comm, strategy <= 3 ? vstrings[strategy] : "BOGUS"); unlock_kernel(); @@ -507,7 +507,7 @@ info.si_trapno = regs->u_regs[UREG_G1]; send_sig_info(SIGSYS, &info, current); if (cnt++ < 4) { - printk("Process makes ni_syscall number %d, register dump:\n", + printk(KERN_EMERG "Process makes ni_syscall number %d, register dump:\n", (int) regs->u_regs[UREG_G1]); show_regs(regs); } @@ -792,7 +792,7 @@ ret = sunos_nfs_mount (dir_page, flags, data); goto out2; } else if(strcmp(type_page, "ufs") == 0) { - printk("Warning: UFS filesystem mounts unsupported.\n"); + printk(KERN_ERR "Warning: UFS filesystem mounts unsupported.\n"); ret = -ENODEV; goto out2; } else if(strcmp(type_page, "proc")) { @@ -855,7 +855,7 @@ asmlinkage int sunos_audit(void) { lock_kernel(); - printk ("sys_audit\n"); + printk (KERN_WARNING "sys_audit\n"); unlock_kernel(); return -1; } diff -urN linux-2.6.0-test1/arch/sparc/kernel/tadpole.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/tadpole.c --- linux-2.6.0-test1/arch/sparc/kernel/tadpole.c 2003-07-13 23:32:29.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/tadpole.c 2003-07-14 06:51:59.000000000 -0400 @@ -112,15 +112,15 @@ clk_nd = prom_searchsiblings(node, "clk-ctrl"); if (!clk_nd) return; - printk("Clock Stopping h/w detected... "); + printk(KERN_INFO "Clock Stopping h/w detected... "); clk_ctrl = (char *) prom_getint(clk_nd, "address"); clk_state = 0; if (name[10] == '\0') { cpu_pwr_save = tsu_clockstop; - printk("enabled (S3)\n"); + printk(KERN_INFO "enabled (S3)\n"); } else if ((name[10] == 'X') || (name[10] == 'G')) { cpu_pwr_save = swift_clockstop; - printk("enabled (%s)\n",name+7); + printk(KERN_INFO "enabled (%s)\n",name+7); } else - printk("disabled %s\n",name+7); + printk(KERN_INFO "disabled %s\n",name+7); } diff -urN linux-2.6.0-test1/arch/sparc/kernel/time.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/time.c --- linux-2.6.0-test1/arch/sparc/kernel/time.c 2003-07-13 23:34:42.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/time.c 2003-07-14 06:53:40.000000000 -0400 @@ -257,7 +257,7 @@ kick_start_clock(); } else if( idprom->id_machtype == (SM_SUN4 | SM_4_260)) { /* intersil setup code */ - printk("Clock: INTERSIL at %8x ",sun4_clock_physaddr); + printk(KERN_NOTICE "Clock: INTERSIL at %8x ",sun4_clock_physaddr); sp_clock_typ = INTERSIL; r.start = sun4_clock_physaddr; intersil_clock = (struct intersil *) @@ -444,7 +444,7 @@ xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ); set_normalized_timespec(&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec); - printk("%u/%u/%u %u:%u:%u\n",day,mon,year,hour,min,sec); + printk(KERN_NOTICE "%u/%u/%u %u:%u:%u\n",day,mon,year,hour,min,sec); } #endif diff -urN linux-2.6.0-test1/arch/sparc/kernel/traps.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/traps.c --- linux-2.6.0-test1/arch/sparc/kernel/traps.c 2003-07-13 23:34:32.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/traps.c 2003-07-14 06:51:59.000000000 -0400 @@ -38,8 +38,8 @@ void syscall_trace_entry(struct pt_regs *regs) { - printk("%s[%d]: ", current->comm, current->pid); - printk("scall<%d> (could be %d)\n", (int) regs->u_regs[UREG_G1], + printk(KERN_NOTICE "%s[%d]: ", current->comm, current->pid); + printk(KERN_NOTICE "scall<%d> (could be %d)\n", (int) regs->u_regs[UREG_G1], (int) regs->u_regs[UREG_I0]); } @@ -51,23 +51,23 @@ { unsigned long afsr, afar; - printk("Aieee: sun4m NMI received!\n"); + printk(KERN_EMERG "Aieee: sun4m NMI received!\n"); /* XXX HyperSparc hack XXX */ __asm__ __volatile__("mov 0x500, %%g1\n\t" "lda [%%g1] 0x4, %0\n\t" "mov 0x600, %%g1\n\t" "lda [%%g1] 0x4, %1\n\t" : "=r" (afsr), "=r" (afar)); - printk("afsr=%08lx afar=%08lx\n", afsr, afar); - printk("you lose buddy boy...\n"); + printk(KERN_EMERG "afsr=%08lx afar=%08lx\n", afsr, afar); + printk(KERN_EMERG "you lose buddy boy...\n"); show_regs(regs); prom_halt(); } void sun4d_nmi(struct pt_regs *regs) { - printk("Aieee: sun4d NMI received!\n"); - printk("you lose buddy boy...\n"); + printk(KERN_EMERG "Aieee: sun4d NMI received!\n"); + printk(KERN_EMERG "you lose buddy boy...\n"); show_regs(regs); prom_halt(); } @@ -80,8 +80,8 @@ return; for(i = -3; i < 6; i++) - printk("%c%08lx%c",i?' ':'<',pc[i],i?' ':'>'); - printk("\n"); + printk(KERN_EMERG "%c%08lx%c",i?' ':'<',pc[i],i?' ':'>'); + printk(KERN_EMERG "\n"); } #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t") @@ -93,13 +93,13 @@ int count = 0; /* Amuse the user. */ - printk( + printk(KERN_EMERG " \\|/ ____ \\|/\n" " \"@'/ ,. \\`@\"\n" " /_| \\__/ |_\\\n" " \\__U_/\n"); - printk("%s(%d): %s [#%d]\n", current->comm, current->pid, str, ++die_counter); + printk(KERN_EMERG "%s(%d): %s [#%d]\n", current->comm, current->pid, str, ++die_counter); show_regs(regs); __SAVE; __SAVE; __SAVE; __SAVE; @@ -118,11 +118,11 @@ count++ < 30 && (((unsigned long) rw) >= PAGE_OFFSET) && !(((unsigned long) rw) & 0x7)) { - printk("Caller[%08lx]\n", rw->ins[7]); + printk(KERN_EMERG "Caller[%08lx]\n", rw->ins[7]); rw = (struct reg_window *)rw->ins[6]; } } - printk("Instruction DUMP:"); + printk(KERN_EMERG "Instruction DUMP:"); instruction_dump ((unsigned long *) regs->pc); if(regs->psr & PSR_PS) do_exit(SIGKILL); @@ -135,7 +135,7 @@ if(type < 0x80) { /* Sun OS's puke from bad traps, Linux survives! */ - printk("Unimplemented Sparc TRAP, type = %02lx\n", type); + printk(KERN_ALERT "Unimplemented Sparc TRAP, type = %02lx\n", type); die_if_kernel("Whee... Hello Mr. Penguin", current->thread.kregs); } @@ -159,7 +159,7 @@ if(psr & PSR_PS) die_if_kernel("Kernel illegal instruction", regs); #ifdef TRAP_DEBUG - printk("Ill instr. at pc=%08lx instruction is %08lx\n", + printk(KERN_DEBUG "Ill instr. at pc=%08lx instruction is %08lx\n", regs->pc, *(unsigned long *)regs->pc); #endif if (!do_user_muldiv (regs, pc)) @@ -196,7 +196,7 @@ siginfo_t info; if(regs->psr & PSR_PS) { - printk("KERNEL MNA at pc %08lx npc %08lx called by %08lx\n", pc, npc, + printk(KERN_ALERT "KERNEL MNA at pc %08lx npc %08lx called by %08lx\n", pc, npc, regs->u_regs[UREG_RETPC]); die_if_kernel("BOGUS", regs); /* die_if_kernel("Kernel MNA access", regs); */ @@ -204,7 +204,7 @@ #if 0 show_regs (regs); instruction_dump ((unsigned long *) regs->pc); - printk ("do_MNA!\n"); + printk (KERN_ALERT "do_MNA!\n"); #endif info.si_signo = SIGBUS; info.si_errno = 0; @@ -298,14 +298,14 @@ fpsave(&fpt->thread.float_regs[0], &fpt->thread.fsr, &fpt->thread.fpqueue[0], &fpt->thread.fpqdepth); #ifdef DEBUG_FPU - printk("Hmm, FP exception, fsr was %016lx\n", fpt->thread.fsr); + printk(KERN_DEBUG "Hmm, FP exception, fsr was %016lx\n", fpt->thread.fsr); #endif switch ((fpt->thread.fsr & 0x1c000)) { /* switch on the contents of the ftt [floating point trap type] field */ #ifdef DEBUG_FPU case (1 << 14): - printk("IEEE_754_exception\n"); + printk(KERN_DEBUG "IEEE_754_exception\n"); break; #endif case (2 << 14): /* unfinished_FPop (underflow & co) */ @@ -314,13 +314,13 @@ break; #ifdef DEBUG_FPU case (4 << 14): - printk("sequence_error (OS bug...)\n"); + printk(KERN_DEBUG "sequence_error (OS bug...)\n"); break; case (5 << 14): - printk("hardware_error (uhoh!)\n"); + printk(KERN_DEBUG "hardware_error (uhoh!)\n"); break; case (6 << 14): - printk("invalid_fp_register (user error)\n"); + printk(KERN_DEBUG "invalid_fp_register (user error)\n"); break; #endif /* DEBUG_FPU */ } @@ -338,7 +338,7 @@ /* The first fsr store/load we tried trapped, * the second one will not (we hope). */ - printk("WARNING: FPU exception from kernel mode. at pc=%08lx\n", + printk(KERN_WARNING "WARNING: FPU exception from kernel mode. at pc=%08lx\n", regs->pc); regs->pc = regs->npc; regs->npc += 4; @@ -395,7 +395,7 @@ unsigned long psr) { #ifdef TRAP_DEBUG - printk("Watchpoint detected at PC %08lx NPC %08lx PSR %08lx\n", + printk(KERN_DEBUG "Watchpoint detected at PC %08lx NPC %08lx PSR %08lx\n", pc, npc, psr); #endif if(psr & PSR_PS) @@ -409,7 +409,7 @@ siginfo_t info; #ifdef TRAP_DEBUG - printk("Register Access Exception at PC %08lx NPC %08lx PSR %08lx\n", + printk(KERN_DEBUG "Register Access Exception at PC %08lx NPC %08lx PSR %08lx\n", pc, npc, psr); #endif info.si_signo = SIGBUS; @@ -439,7 +439,7 @@ siginfo_t info; #ifdef TRAP_DEBUG - printk("Co-Processor Exception at PC %08lx NPC %08lx PSR %08lx\n", + printk(KERN_DEBUG "Co-Processor Exception at PC %08lx NPC %08lx PSR %08lx\n", pc, npc, psr); #endif info.si_signo = SIGILL; @@ -467,7 +467,7 @@ void do_BUG(const char *file, int line) { // bust_spinlocks(1); XXX Not in our original BUG() - printk("kernel BUG at %s:%d!\n", file, line); + printk(KERN_ALERT "kernel BUG at %s:%d!\n", file, line); } #endif diff -urN linux-2.6.0-test1/arch/sparc/kernel/unaligned.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/unaligned.c --- linux-2.6.0-test1/arch/sparc/kernel/unaligned.c 2003-07-13 23:37:23.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/kernel/unaligned.c 2003-07-14 06:51:59.000000000 -0400 @@ -61,7 +61,7 @@ else if(insn == 2) return 2; else { - printk("Impossible unaligned trap. insn=%08x\n", insn); + printk(KERN_EMERG "Impossible unaligned trap. insn=%08x\n", insn); die_if_kernel("Byte sized unaligned access?!?!", current->thread.kregs); return 4; /* just to keep gcc happy. */ } @@ -372,7 +372,7 @@ int size = decode_access_size(insn); if(!ok_for_kernel(insn) || dir == both) { - printk("Unsupported unaligned load/store trap for kernel at <%08lx>.\n", + printk(KERN_EMERG "Unsupported unaligned load/store trap for kernel at <%08lx>.\n", regs->pc); unaligned_panic("Wheee. Kernel does fpu/atomic unaligned load/store."); @@ -389,7 +389,7 @@ unsigned long addr = compute_effective_address(regs, insn); #ifdef DEBUG_MNA - printk("KMNA: pc=%08lx [dir=%s addr=%08lx size=%d] retpc[%08lx]\n", + printk(KERN_DEBUG "KMNA: pc=%08lx [dir=%s addr=%08lx size=%d] retpc[%08lx]\n", regs->pc, dirstrings[dir], addr, size, regs->u_regs[UREG_RETPC]); #endif switch(dir) { @@ -487,7 +487,7 @@ unsigned long addr; if(floating_point_load_or_store_p(insn)) { - printk("User FPU load/store unaligned unsupported.\n"); + printk(KERN_ALERT "User FPU load/store unaligned unsupported.\n"); goto kill_user; } @@ -516,7 +516,7 @@ * This was supported in 2.4. However, we question * the value of SWAP instruction across word boundaries. */ - printk("Unaligned SWAP unsupported.\n"); + printk(KERN_ALERT "Unaligned SWAP unsupported.\n"); goto kill_user; #endif break; diff -urN linux-2.6.0-test1/arch/sparc/lib/debuglocks.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/lib/debuglocks.c --- linux-2.6.0-test1/arch/sparc/lib/debuglocks.c 2003-07-13 23:30:48.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/lib/debuglocks.c 2003-07-14 19:37:37.000000000 -0400 @@ -30,7 +30,7 @@ { int cpu = smp_processor_id(); - printk("%s(%p) CPU#%d stuck at %08lx, owner PC(%08lx):CPU(%lx)\n",str, + printk(KERN_WARNING "%s(%p) CPU#%d stuck at %08lx, owner PC(%08lx):CPU(%lx)\n",str, lock, cpu, caller, lock->owner_pc & ~3, lock->owner_pc & 3); } @@ -38,7 +38,7 @@ { int cpu = smp_processor_id(); - printk("%s(%p) CPU#%d stuck at %08lx, owner PC(%08lx):CPU(%lx)\n", str, + printk(KERN_WARNING "%s(%p) CPU#%d stuck at %08lx, owner PC(%08lx):CPU(%lx)\n", str, lock, cpu, caller, lock->owner_pc & ~3, lock->owner_pc & 3); } @@ -47,13 +47,13 @@ int cpu = smp_processor_id(); int i; - printk("%s(%p) CPU#%d stuck at %08lx, owner PC(%08lx):CPU(%lx)", str, + printk(KERN_WARNING "%s(%p) CPU#%d stuck at %08lx, owner PC(%08lx):CPU(%lx)", str, lock, cpu, caller, lock->owner_pc & ~3, lock->owner_pc & 3); for(i = 0; i < NR_CPUS; i++) - printk(" reader[%d]=%08lx", i, lock->reader_pc[i]); + printk(KERN_WARNING " reader[%d]=%08lx", i, lock->reader_pc[i]); - printk("\n"); + printk(KERN_WARNING "\n"); } #undef INIT_STUCK diff -urN linux-2.6.0-test1/arch/sparc/math-emu/math.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/math-emu/math.c --- linux-2.6.0-test1/arch/sparc/math-emu/math.c 2003-07-13 23:33:47.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/math-emu/math.c 2003-07-14 19:58:14.000000000 -0400 @@ -164,16 +164,16 @@ unsigned long insn; #ifdef DEBUG_MATHEMU - printk("In do_mathemu()... pc is %08lx\n", regs->pc); - printk("fpqdepth is %ld\n", fpt->thread.fpqdepth); + printk(KERN_DEBUG "In do_mathemu()... pc is %08lx\n", regs->pc); + printk(KERN_DEBUG "fpqdepth is %ld\n", fpt->thread.fpqdepth); for (i = 0; i < fpt->thread.fpqdepth; i++) - printk("%d: %08lx at %08lx\n", i, fpt->thread.fpqueue[i].insn, + printk(KERN_DEBUG "%d: %08lx at %08lx\n", i, fpt->thread.fpqueue[i].insn, (unsigned long)fpt->thread.fpqueue[i].insn_addr); #endif if (fpt->thread.fpqdepth == 0) { /* no queue, guilty insn is at regs->pc */ #ifdef DEBUG_MATHEMU - printk("precise trap at %08lx\n", regs->pc); + printk(KERN_DEBUG "precise trap at %08lx\n", regs->pc); #endif if (!get_user(insn, (u32 *)regs->pc)) { retcode = do_one_mathemu(insn, &fpt->thread.fsr, fpt->thread.float_regs); @@ -286,7 +286,7 @@ long fsr; #ifdef DEBUG_MATHEMU - printk("In do_mathemu(), emulating %08lx\n", insn); + printk(KERN_DEBUG "In do_mathemu(), emulating %08lx\n", insn); #endif if ((insn & 0xc1f80000) == 0x81a00000) /* FPOP1 */ { @@ -325,7 +325,7 @@ case FNEGS: TYPE(2,1,0,1,0,0,0); break; default: #ifdef DEBUG_MATHEMU - printk("unknown FPop1: %03lx\n",(insn>>5)&0x1ff); + printk(KERN_DEBUG "unknown FPop1: %03lx\n",(insn>>5)&0x1ff); #endif } } else if ((insn & 0xc1f80000) == 0x81a80000) /* FPOP2 */ { @@ -338,14 +338,14 @@ case FCMPEQ: TYPE(3,0,0,3,1,3,1); break; default: #ifdef DEBUG_MATHEMU - printk("unknown FPop2: %03lx\n",(insn>>5)&0x1ff); + printk(KERN_DEBUG "unknown FPop2: %03lx\n",(insn>>5)&0x1ff); #endif } } if (!type) { /* oops, didn't recognise that FPop */ #ifdef DEBUG_MATHEMU - printk("attempt to emulate unrecognised FPop!\n"); + printk(KERN_DEBUG "attempt to emulate unrecognised FPop!\n"); #endif return 0; } @@ -424,7 +424,7 @@ break; } #ifdef DEBUG_MATHEMU - printk("executing insn...\n"); + printk(KERN_DEBUG "executing insn...\n"); #endif /* do the Right Thing */ switch ((insn >> 5) & 0x1ff) { diff -urN linux-2.6.0-test1/arch/sparc/mm/fault.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/mm/fault.c --- linux-2.6.0-test1/arch/sparc/mm/fault.c 2003-07-13 23:32:42.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/mm/fault.c 2003-07-14 19:42:31.000000000 -0400 @@ -73,7 +73,7 @@ bytes = mlist->num_bytes; tally += bytes; if (i >= SPARC_PHYS_BANKS-1) { - printk ("The machine has more banks than " + printk (KERN_WARNING "The machine has more banks than " "this kernel can support\n" "Increase the SPARC_PHYS_BANKS " "setting (currently %d)\n", @@ -121,14 +121,14 @@ unsigned long avaddr) { sun4c_complete_all_stores(); - printk("FAULT: NMI received\n"); - printk("SREGS: Synchronous Error %08lx\n", serr); - printk(" Synchronous Vaddr %08lx\n", svaddr); - printk(" Asynchronous Error %08lx\n", aerr); - printk(" Asynchronous Vaddr %08lx\n", avaddr); + printk(KERN_EMERG "FAULT: NMI received\n"); + printk(KERN_EMERG "SREGS: Synchronous Error %08lx\n", serr); + printk(KERN_EMERG " Synchronous Vaddr %08lx\n", svaddr); + printk(KERN_EMERG " Asynchronous Error %08lx\n", aerr); + printk(KERN_EMERG " Asynchronous Vaddr %08lx\n", avaddr); if (sun4c_memerr_reg) - printk(" Memory Parity Error %08lx\n", *sun4c_memerr_reg); - printk("REGISTER DUMP:\n"); + printk(KERN_EMERG " Memory Parity Error %08lx\n", *sun4c_memerr_reg); + printk(KERN_EMERG "REGISTER DUMP:\n"); show_regs(regs); prom_halt(); } @@ -301,7 +301,7 @@ /* User mode accesses just cause a SIGSEGV */ if(from_user) { #if 0 - printk("Fault whee %s [%d]: segfaults at %08lx pc=%08lx\n", + printk(KERN_ERR "Fault whee %s [%d]: segfaults at %08lx pc=%08lx\n", tsk->comm, tsk->pid, address, regs->pc); #endif info.si_signo = SIGSEGV; @@ -325,8 +325,8 @@ extern const unsigned __csum_partial_copy_end[]; #ifdef DEBUG_EXCEPTIONS - printk("Exception: PC<%08lx> faddr<%08lx>\n", regs->pc, address); - printk("EX_TABLE: insn<%08lx> fixup<%08x> g2<%08lx>\n", + printk(KERN_DEBUG "Exception: PC<%08lx> faddr<%08lx>\n", regs->pc, address); + printk(KERN_DEBUG "EX_TABLE: insn<%08lx> fixup<%08x> g2<%08lx>\n", regs->pc, fixup, g2); #endif if ((regs->pc >= (unsigned long)__memset_start && @@ -352,7 +352,7 @@ */ out_of_memory: up_read(&mm->mmap_sem); - printk("VM: killing process %s\n", tsk->comm); + printk(KERN_WARNING "VM: killing process %s\n", tsk->comm); if (from_user) do_exit(SIGKILL); goto no_context; @@ -489,7 +489,7 @@ info.si_code = SEGV_MAPERR; #if 0 - printk("wf\n", + printk(KERN_DEBUG "wf\n", tsk->pid, write, address); #endif down_read(&mm->mmap_sem); @@ -518,7 +518,7 @@ bad_area: up_read(&mm->mmap_sem); #if 0 - printk("Window whee %s [%d]: segfaults at %08lx\n", + printk(KERN_ERR "Window whee %s [%d]: segfaults at %08lx\n", tsk->comm, tsk->pid, address); #endif info.si_signo = SIGSEGV; diff -urN linux-2.6.0-test1/arch/sparc/mm/generic.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/mm/generic.c --- linux-2.6.0-test1/arch/sparc/mm/generic.c 2003-07-13 23:37:58.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/mm/generic.c 2003-07-14 19:56:01.000000000 -0400 @@ -35,7 +35,7 @@ swap_free(pte_to_swp_entry(page)); #else if (!pte_none(page)) { - printk("forget_pte: old mapping existed!\n"); + printk(KERN_CRIT "forget_pte: old mapping existed!\n"); BUG(); } #endif diff -urN linux-2.6.0-test1/arch/sparc/mm/init.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/mm/init.c --- linux-2.6.0-test1/arch/sparc/mm/init.c 2003-07-13 23:33:47.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/mm/init.c 2003-07-14 19:45:47.000000000 -0400 @@ -73,17 +73,17 @@ void show_mem(void) { - printk("Mem-info:\n"); + printk(KERN_INFO "Mem-info:\n"); show_free_areas(); - printk("Free swap: %6dkB\n", + printk(KERN_INFO "Free swap: %6dkB\n", nr_swap_pages << (PAGE_SHIFT-10)); - printk("%ld pages of RAM\n", totalram_pages); - printk("%d free pages\n", nr_free_pages()); + printk(KERN_INFO "%ld pages of RAM\n", totalram_pages); + printk(KERN_INFO "%d free pages\n", nr_free_pages()); #if 0 /* undefined pgtable_cache_size, pgd_cache_size */ - printk("%ld pages in page table cache\n",pgtable_cache_size); + printk(KERN_INFO "%ld pages in page table cache\n",pgtable_cache_size); #ifndef CONFIG_SMP if (sparc_cpu_model == sun4m || sparc_cpu_model == sun4d) - printk("%ld entries in page dir cache\n",pgd_cache_size); + printk(KERN_INFO "%ld entries in page dir cache\n",pgd_cache_size); #endif #endif } @@ -381,7 +381,7 @@ unsigned long tmp; #ifdef DEBUG_HIGHMEM - printk("mapping high region %08lx - %08lx\n", start_pfn, end_pfn); + printk(KERN_DEBUG "mapping high region %08lx - %08lx\n", start_pfn, end_pfn); #endif for (tmp = start_pfn; tmp < end_pfn; tmp++) { diff -urN linux-2.6.0-test1/arch/sparc/mm/iommu.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/mm/iommu.c --- linux-2.6.0-test1/arch/sparc/mm/iommu.c 2003-07-13 23:38:51.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/mm/iommu.c 2003-07-14 19:57:09.000000000 -0400 @@ -119,7 +119,7 @@ } bit_map_init(&iommu->usemap, bitmap, IOMMU_NPTES); - printk("IOMMU: impl %d vers %d table 0x%p[%d B] map [%d b]\n", + printk(KERN_NOTICE "IOMMU: impl %d vers %d table 0x%p[%d B] map [%d b]\n", impl, vers, iommu->page_table, (int)(IOMMU_NPTES*sizeof(iopte_t)), (int)IOMMU_NPTES); diff -urN linux-2.6.0-test1/arch/sparc/mm/srmmu.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/mm/srmmu.c --- linux-2.6.0-test1/arch/sparc/mm/srmmu.c 2003-07-13 23:34:42.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/mm/srmmu.c 2003-07-14 19:54:14.000000000 -0400 @@ -316,11 +316,11 @@ int offset; if (size < SRMMU_NOCACHE_BITMAP_SHIFT) { - printk("Size 0x%x too small for nocache request\n", size); + printk(KERN_WARNING "Size 0x%x too small for nocache request\n", size); size = SRMMU_NOCACHE_BITMAP_SHIFT; } if (size & (SRMMU_NOCACHE_BITMAP_SHIFT-1)) { - printk("Size 0x%x unaligned int nocache request\n", size); + printk(KERN_WARNING "Size 0x%x unaligned int nocache request\n", size); size += SRMMU_NOCACHE_BITMAP_SHIFT-1; } if (align > SRMMU_NOCACHE_ALIGN_MAX) { @@ -331,11 +331,11 @@ offset = bit_map_string_get(&srmmu_nocache_map, size >> SRMMU_NOCACHE_BITMAP_SHIFT, align >> SRMMU_NOCACHE_BITMAP_SHIFT); -/* P3 */ /* printk("srmmu: get size %d align %d, got %d (0x%x)\n", +/* P3 */ /* printk(KERN_NOTICE "srmmu: get size %d align %d, got %d (0x%x)\n", size >> SRMMU_NOCACHE_BITMAP_SHIFT, align >> SRMMU_NOCACHE_BITMAP_SHIFT, offset, offset); */ if (offset == -1) { - printk("srmmu: out of nocache %d: %d/%d\n", + printk(KERN_WARNING "srmmu: out of nocache %d: %d/%d\n", size, (int) srmmu_nocache_size, srmmu_nocache_map.used << SRMMU_NOCACHE_BITMAP_SHIFT); return 0; @@ -361,32 +361,32 @@ int offset; if (vaddr < SRMMU_NOCACHE_VADDR) { - printk("Vaddr %lx is smaller than nocache base 0x%lx\n", + printk(KERN_CRIT "Vaddr %lx is smaller than nocache base 0x%lx\n", vaddr, (unsigned long)SRMMU_NOCACHE_VADDR); BUG(); } if (vaddr >= srmmu_nocache_end) { - printk("Vaddr %lx is bigger than nocache end 0x%lx\n", + printk(KERN_CRIT "Vaddr %lx is bigger than nocache end 0x%lx\n", vaddr, srmmu_nocache_end); BUG(); } if (size & (size-1)) { - printk("Size 0x%x is not a power of 2\n", size); + printk(KERN_CRIT "Size 0x%x is not a power of 2\n", size); BUG(); } if (size < SRMMU_NOCACHE_BITMAP_SHIFT) { - printk("Size 0x%x is too small\n", size); + printk(KERN_CRIT "Size 0x%x is too small\n", size); BUG(); } if (vaddr & (size-1)) { - printk("Vaddr %lx is not aligned to size 0x%x\n", vaddr, size); + printk(KERN_CRIT "Vaddr %lx is not aligned to size 0x%x\n", vaddr, size); BUG(); } offset = (vaddr - SRMMU_NOCACHE_VADDR) >> SRMMU_NOCACHE_BITMAP_SHIFT; size = size >> SRMMU_NOCACHE_BITMAP_SHIFT; -/* P3 */ /* printk("srmmu: free off %d (0x%x) size %d\n", offset, offset, size); */ +/* P3 */ /* printk(KERN_NOTICE "srmmu: free off %d (0x%x) size %d\n", offset, offset, size); */ bit_map_clear(&srmmu_nocache_map, offset, size); } @@ -448,7 +448,7 @@ paddr = __pa((unsigned long)srmmu_nocache_pool); vaddr = SRMMU_NOCACHE_VADDR; -/* P3 */ printk("srmmu: pool 0x%x vaddr 0x%x bitmap 0x%x bits %d (0x%x)\n", +/* P3 */ printk(KERN_NOTICE "srmmu: pool 0x%x vaddr 0x%x bitmap 0x%x bits %d (0x%x)\n", (int)srmmu_nocache_pool, vaddr, srmmu_nocache_bitmap, bitmap_bits, bitmap_bits); while (vaddr < srmmu_nocache_end) { @@ -713,7 +713,7 @@ if (address == last) { val = srmmu_hwprobe(address); if (val != 0 && pte_val(pte) != val) { - printk("swift_update_mmu_cache: " + printk(KERN_NOTICE "swift_update_mmu_cache: " "addr %lx put %08x probed %08x from %p\n", address, pte_val(pte), val, __builtin_return_address(0)); @@ -749,7 +749,7 @@ cctx = srmmu_get_context(); /* Is context # ever different from current context? P3 */ if (cctx != ctx1) { - printk("flush ctx %02x curr %02x\n", ctx1, cctx); + printk(KERN_NOTICE "flush ctx %02x curr %02x\n", ctx1, cctx); srmmu_set_context(ctx1); swift_flush_page(page); __asm__ __volatile__("sta %%g0, [%0] %1\n\t" : : @@ -1452,7 +1452,7 @@ vac_cache_size = max_size; vac_line_size = min_line_size; #endif - printk("SRMMU: Using VAC size of %d bytes, line size %d bytes.\n", + printk(KERN_NOTICE "SRMMU: Using VAC size of %d bytes, line size %d bytes.\n", (int)vac_cache_size, (int)vac_line_size); } diff -urN linux-2.6.0-test1/arch/sparc/mm/sun4c.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/mm/sun4c.c --- linux-2.6.0-test1/arch/sparc/mm/sun4c.c 2003-07-13 23:36:43.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/mm/sun4c.c 2003-07-14 19:55:41.000000000 -0400 @@ -526,7 +526,7 @@ (idprom->id_machtype == (SM_SUN4 | SM_4_330)) || (idprom->id_machtype == (SM_SUN4C | SM_4C_ELC))) { /* Whee.. */ - printk("SS2 cache bug detected, uncaching trap table page\n"); + printk(KERN_ERR "SS2 cache bug detected, uncaching trap table page\n"); sun4c_flush_page((unsigned int) &start); sun4c_put_pte(((unsigned long) &start), (sun4c_get_pte((unsigned long) &start) | _SUN4C_PAGE_NOCACHE)); @@ -1165,7 +1165,7 @@ abend: restore_flags(flags); - printk("DMA vaddr=0x%p size=%08lx\n", vaddr, size); + printk(KERN_EMERG "DMA vaddr=0x%p size=%08lx\n", vaddr, size); panic("Out of iobuffer table"); return 0; } @@ -2112,7 +2112,7 @@ max_user_taken_entries = num_segmaps - cnt - 40 - 1; - printk("SUN4C: %d mmu entries for the kernel\n", cnt); + printk(KERN_NOTICE "SUN4C: %d mmu entries for the kernel\n", cnt); } /* Load up routines and constants for sun4c mmu */ @@ -2120,7 +2120,7 @@ { extern void ___xchg32_sun4c(void); - printk("Loading sun4c MMU routines\n"); + printk(KERN_INFO "Loading sun4c MMU routines\n"); /* First the constants */ BTFIXUPSET_SIMM13(pmd_shift, SUN4C_PMD_SHIFT); diff -urN linux-2.6.0-test1/arch/sparc/prom/init.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/prom/init.c --- linux-2.6.0-test1/arch/sparc/prom/init.c 2003-07-13 23:28:55.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/prom/init.c 2003-07-14 19:38:03.000000000 -0400 @@ -86,7 +86,7 @@ #ifndef CONFIG_SUN4 /* SUN4 prints this in sun4_prom_init */ - printk("PROMLIB: Sun Boot Prom Version %d Revision %d\n", + printk(KERN_INFO "PROMLIB: Sun Boot Prom Version %d Revision %d\n", romvec->pv_romvers, prom_rev); #endif diff -urN linux-2.6.0-test1/arch/sparc/prom/sun4prom.c linux-2.6.0-test1-printk-arch-sparc/arch/sparc/prom/sun4prom.c --- linux-2.6.0-test1/arch/sparc/prom/sun4prom.c 2003-07-13 23:32:00.000000000 -0400 +++ linux-2.6.0-test1-printk-arch-sparc/arch/sparc/prom/sun4prom.c 2003-07-14 19:38:22.000000000 -0400 @@ -153,7 +153,7 @@ */ sun4_romvec->setLEDs(0x0); - printk("PROMLIB: Old Sun4 boot PROM monitor %s, romvec version %d\n", + printk(KERN_INFO "PROMLIB: Old Sun4 boot PROM monitor %s, romvec version %d\n", sun4_romvec->monid, sun4_romvec->romvecversion);