--- linux-2.6.22.14/arch/powerpc/kernel/process.c 2008-01-22 13:59:14.000000000 +0200 +++ linux/arch/powerpc/kernel/process.c 2008-01-15 10:59:50.000000000 +0200 @@ -344,7 +344,7 @@ static void show_instructions(struct pt_ unsigned long pc = regs->nip - (instructions_to_print * 3 / 4 * sizeof(int)); - printk("Instruction dump:"); + printb("Instruction dump:"); for (i = 0; i < instructions_to_print; i++) { int instr; @@ -358,18 +358,18 @@ static void show_instructions(struct pt_ */ if (!__kernel_text_address(pc) || __get_user(instr, (unsigned int __user *)pc)) { - printk("XXXXXXXX "); + printb("XXXXXXXX "); } else { if (regs->nip == pc) - printk("<%08x> ", instr); + printb("<%08x> ", instr); else - printk("%08x ", instr); + printb("%08x ", instr); } pc += sizeof(int); } - printk("\n"); + printb("\n"); } static struct regbit { @@ -389,13 +389,13 @@ static void printbits(unsigned long val, { const char *sep = ""; - printk("<"); + printb("<"); for (; bits->bit; ++bits) if (val & bits->bit) { - printk("%s%s", sep, bits->name); + printb("%s%s", sep, bits->name); sep = ","; } - printk(">"); + printb(">"); } #ifdef CONFIG_PPC64 @@ -412,39 +412,39 @@ void show_regs(struct pt_regs * regs) { int i, trap; - printk("NIP: "REG" LR: "REG" CTR: "REG"\n", + printb("NIP: "REG" LR: "REG" CTR: "REG"\n", regs->nip, regs->link, regs->ctr); - printk("REGS: %p TRAP: %04lx %s (%s)\n", + printb("REGS: %p TRAP: %04lx %s (%s)\n", regs, regs->trap, print_tainted(), init_utsname()->release); - printk("MSR: "REG" ", regs->msr); + printb("MSR: "REG" ", regs->msr); printbits(regs->msr, msr_bits); - printk(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer); + printb(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer); trap = TRAP(regs); if (trap == 0x300 || trap == 0x600) - printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr); - printk("TASK = %p[%d] '%s' THREAD: %p", + printb("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr); + printb("TASK = %p[%d] '%s' THREAD: %p", current, current->pid, current->comm, task_thread_info(current)); #ifdef CONFIG_SMP - printk(" CPU: %d", smp_processor_id()); + printb(" CPU: %d", smp_processor_id()); #endif /* CONFIG_SMP */ for (i = 0; i < 32; i++) { if ((i % REGS_PER_LINE) == 0) - printk("\n" KERN_INFO "GPR%02d: ", i); - printk(REG " ", regs->gpr[i]); + printb("\n" KERN_INFO "GPR%02d: ", i); + printb(REG " ", regs->gpr[i]); if (i == LAST_VOLATILE && !FULL_REGS(regs)) break; } - printk("\n"); + printb("\n"); #ifdef CONFIG_KALLSYMS /* * Lookup NIP late so we have the best change of getting the * above info out without failing */ - printk("NIP ["REG"] ", regs->nip); + printb("NIP ["REG"] ", regs->nip); print_symbol("%s\n", regs->nip); - printk("LR ["REG"] ", regs->link); + printb("LR ["REG"] ", regs->link); print_symbol("%s\n", regs->link); #endif show_stack(current, (unsigned long *) regs->gpr[1]); @@ -920,7 +920,7 @@ void show_stack(struct task_struct *tsk, } lr = 0; - printk("Call Trace:\n"); + printb("Call Trace:\n"); do { if (!validate_sp(sp, tsk, MIN_STACK_FRAME)) return; @@ -929,11 +929,11 @@ void show_stack(struct task_struct *tsk, newsp = stack[0]; ip = stack[FRAME_LR_SAVE]; if (!firstframe || ip != lr) { - printk("["REG"] ["REG"] ", sp, ip); + printb("["REG"] ["REG"] ", sp, ip); print_symbol("%s", ip); if (firstframe) - printk(" (unreliable)"); - printk("\n"); + printb(" (unreliable)"); + printb("\n"); } firstframe = 0; @@ -945,7 +945,7 @@ void show_stack(struct task_struct *tsk, && stack[FRAME_MARKER] == REGS_MARKER) { struct pt_regs *regs = (struct pt_regs *) (sp + STACK_FRAME_OVERHEAD); - printk("--- Exception: %lx", regs->trap); + printb("--- Exception: %lx", regs->trap); print_symbol(" at %s\n", regs->nip); lr = regs->link; print_symbol(" LR = %s\n", lr);