From 18f77c6dc6a37d88579e309807344bb7cc79b6f0 Mon Sep 17 00:00:00 2001 From: Helge Deller Date: Wed, 31 Dec 2008 03:11:31 +0000 Subject: [PATCH] --- yaml --- r: 128007 b: refs/heads/master c: 7f2347a44d2d5c8edf04d6950f4fb21ac868d256 h: refs/heads/master i: 128005: 0f7de3d0fc5922798ff5b68a28604527860b0dca 128003: 53a3a937c521acba62257bc7f8b180692244c5d8 127999: c3235cfcfeead2886fbe3590299afabe7ec72392 v: v3 --- [refs] | 2 +- trunk/arch/parisc/kernel/irq.c | 2 +- trunk/arch/parisc/kernel/smp.c | 8 ++------ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ea7176fe67a5..0681c49f01a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70da2d96306bea9ab56a1c6907b19f889dcdda5c +refs/heads/master: 7f2347a44d2d5c8edf04d6950f4fb21ac868d256 diff --git a/trunk/arch/parisc/kernel/irq.c b/trunk/arch/parisc/kernel/irq.c index 4cea935e2f99..13fc4cd5bfdf 100644 --- a/trunk/arch/parisc/kernel/irq.c +++ b/trunk/arch/parisc/kernel/irq.c @@ -421,5 +421,5 @@ void __init init_IRQ(void) void ack_bad_irq(unsigned int irq) { - printk("unexpected IRQ %d\n", irq); + printk(KERN_WARNING "unexpected IRQ %d\n", irq); } diff --git a/trunk/arch/parisc/kernel/smp.c b/trunk/arch/parisc/kernel/smp.c index 80bc000523fa..70a5e0d50685 100644 --- a/trunk/arch/parisc/kernel/smp.c +++ b/trunk/arch/parisc/kernel/smp.c @@ -224,10 +224,7 @@ send_IPI_mask(cpumask_t mask, enum ipi_message_type op) static inline void send_IPI_single(int dest_cpu, enum ipi_message_type op) { - if (dest_cpu == NO_PROC_ID) { - BUG(); - return; - } + BUG_ON(dest_cpu == NO_PROC_ID); ipi_send(dest_cpu, op); } @@ -309,8 +306,7 @@ smp_cpu_init(int cpunum) /* Initialise the idle task for this CPU */ atomic_inc(&init_mm.mm_count); current->active_mm = &init_mm; - if(current->mm) - BUG(); + BUG_ON(current->mm); enter_lazy_tlb(&init_mm, current); init_IRQ(); /* make sure no IRQs are enabled or pending */