diff options
author | Helge Deller <deller@gmx.de> | 2008-12-30 22:11:31 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@mcmartin.ca> | 2009-01-05 14:00:21 -0500 |
commit | 7f2347a44d2d5c8edf04d6950f4fb21ac868d256 (patch) | |
tree | 8ec2b9c293faf6d3285004ad2c5aad8113541fb0 /arch | |
parent | 70da2d96306bea9ab56a1c6907b19f889dcdda5c (diff) |
parisc: trivial fixes
trivial fixes:
- use KERN_WARNING for printk()
- use BUG_ON() instead of "if (xx) BUG();"
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Diffstat (limited to 'arch')
-rw-r--r-- | arch/parisc/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/smp.c | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index 4cea935e2f99..13fc4cd5bfdf 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c | |||
@@ -421,5 +421,5 @@ void __init init_IRQ(void) | |||
421 | 421 | ||
422 | void ack_bad_irq(unsigned int irq) | 422 | void ack_bad_irq(unsigned int irq) |
423 | { | 423 | { |
424 | printk("unexpected IRQ %d\n", irq); | 424 | printk(KERN_WARNING "unexpected IRQ %d\n", irq); |
425 | } | 425 | } |
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c index 80bc000523fa..70a5e0d50685 100644 --- a/arch/parisc/kernel/smp.c +++ b/arch/parisc/kernel/smp.c | |||
@@ -224,10 +224,7 @@ send_IPI_mask(cpumask_t mask, enum ipi_message_type op) | |||
224 | static inline void | 224 | static inline void |
225 | send_IPI_single(int dest_cpu, enum ipi_message_type op) | 225 | send_IPI_single(int dest_cpu, enum ipi_message_type op) |
226 | { | 226 | { |
227 | if (dest_cpu == NO_PROC_ID) { | 227 | BUG_ON(dest_cpu == NO_PROC_ID); |
228 | BUG(); | ||
229 | return; | ||
230 | } | ||
231 | 228 | ||
232 | ipi_send(dest_cpu, op); | 229 | ipi_send(dest_cpu, op); |
233 | } | 230 | } |
@@ -309,8 +306,7 @@ smp_cpu_init(int cpunum) | |||
309 | /* Initialise the idle task for this CPU */ | 306 | /* Initialise the idle task for this CPU */ |
310 | atomic_inc(&init_mm.mm_count); | 307 | atomic_inc(&init_mm.mm_count); |
311 | current->active_mm = &init_mm; | 308 | current->active_mm = &init_mm; |
312 | if(current->mm) | 309 | BUG_ON(current->mm); |
313 | BUG(); | ||
314 | enter_lazy_tlb(&init_mm, current); | 310 | enter_lazy_tlb(&init_mm, current); |
315 | 311 | ||
316 | init_IRQ(); /* make sure no IRQs are enabled or pending */ | 312 | init_IRQ(); /* make sure no IRQs are enabled or pending */ |