arch/i386/kernel/irq.c

*--- linux-2.6.14-rc3.orig/arch/i386/kernel/irq.c 2005-09-30 23:17:35.000000000 +0200*
*+++ linux-2.6.14-rc3/arch/i386/kernel/irq.c 2005-10-05 18:44:49.000000000 +0200*
@@ -29,7 +29,7 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
*/
void ack_bad_irq(unsigned int irq)
{
- printk("unexpected IRQ trap at vector %02x\n", irq);
+ printk(KERN_ERR "unexpected IRQ trap at vector %02x\n", irq);
}
#endif

@@ -69,7 +69,7 @@ fastcall unsigned int do_IRQ(struct pt_r

		__asm__ __volatile__("andl %%esp,%0" :
					"=r" (esp) : "0" (THREAD_SIZE - 1));
		if (unlikely(esp < (sizeof(struct thread_info) + STACK_WARN))) {
-			printk("do_IRQ: stack overflow: %ld\n",
+			printk(KERN_ERR "do_IRQ: stack overflow: %ld\n",
				esp - sizeof(struct thread_info));
			dump_stack();
		}

@@ -152,7 +152,7 @@ void irq_ctx_init(int cpu)

	softirq_ctx[cpu] = irqctx;

- printk("CPU %u irqstacks, hard=%p soft=%p\n",
+ printk(KERN_INFO "CPU %u irqstacks, hard=%p soft=%p\n",

		cpu,hardirq_ctx[cpu],softirq_ctx[cpu]);
}

@@ -279,13 +279,13 @@ void fixup_irqs(cpumask_t map)

		cpus_and(mask, irq_affinity[irq], map);
		if (any_online_cpu(mask) == NR_CPUS) {
-			printk("Breaking affinity for irq %i\n", irq);
+			printk(KERN_ERR "Breaking affinity for irq %i\n", irq);
			mask = map;
		}
		if (irq_desc[irq].handler->set_affinity)
			irq_desc[irq].handler->set_affinity(irq, mask);
		else if (irq_desc[irq].action && !(warned++))
-			printk("Cannot set affinity for irq %i\n", irq);
+			printk(KERN_ERR "Cannot set affinity for irq %i\n", irq);
	}

#if 0

Hi!
New patch from me ;-) . This time I haven't made as many mistakes as last time and I've read the KERN constants in kernel.h I hope this is an ok patch. Just in case Thunderbird wraps the text _again_ I'm also sending the patch as an attachment. The most significant condition this time is KERN_ERR, because there doesn't seem to be critical failures in this file.

Dinolinux

@@ -29,7 +29,7 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
  */
 void ack_bad_irq(unsigned int irq)
 {
-	printk("unexpected IRQ trap at vector %02x\n", irq);
+	printk(KERN_ERR "unexpected IRQ trap at vector %02x\n", irq);
 }
 #endif
 

@@ -69,7 +69,7 @@ fastcall unsigned int do_IRQ(struct pt_r
 		__asm__ __volatile__("andl %%esp,%0" :
 					"=r" (esp) : "0" (THREAD_SIZE - 1));
 		if (unlikely(esp < (sizeof(struct thread_info) + STACK_WARN))) {
-			printk("do_IRQ: stack overflow: %ld\n",
+			printk(KERN_ERR "do_IRQ: stack overflow: %ld\n",
 				esp - sizeof(struct thread_info));
 			dump_stack();
 		}

@@ -152,7 +152,7 @@ void irq_ctx_init(int cpu)
 
 	softirq_ctx[cpu] = irqctx;
 
-	printk("CPU %u irqstacks, hard=%p soft=%p\n",
+	printk(KERN_INFO "CPU %u irqstacks, hard=%p soft=%p\n",
 		cpu,hardirq_ctx[cpu],softirq_ctx[cpu]);
 }
 

@@ -279,13 +279,13 @@ void fixup_irqs(cpumask_t map)
 
 		cpus_and(mask, irq_affinity[irq], map);
 		if (any_online_cpu(mask) == NR_CPUS) {
-			printk("Breaking affinity for irq %i\n", irq);
+			printk(KERN_ERR "Breaking affinity for irq %i\n", irq);
 			mask = map;
 		}
 		if (irq_desc[irq].handler->set_affinity)
 			irq_desc[irq].handler->set_affinity(irq, mask);
 		else if (irq_desc[irq].action && !(warned++))
-			printk("Cannot set affinity for irq %i\n", irq);
+			printk(KERN_ERR "Cannot set affinity for irq %i\n", irq);
 	}
 
 #if 0

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors