Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm

[karo-tx-linux.git] / arch / blackfin / mach-common / ints-priority.c

diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index 9660d5fdbed4786f51b64e5216bfc13b09efc48e..7ca09ec2ca539cf01ec9e3f81240b5fa9c0c94b8 100644 (file)
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -328,7 +328,7 @@ static void bfin_sec_set_priority(unsigned int sec_int_levels, u8 *sec_int_prior
        hard_local_irq_restore(flags);
 }
 
-static void bfin_sec_raise_irq(unsigned int sid)
+void bfin_sec_raise_irq(unsigned int sid)
 {
        unsigned long flags = hard_local_irq_save();
 
@@ -434,10 +434,10 @@ void handle_core_fault(unsigned int irq, struct irq_desc *desc)
                panic("Kernel core hardware error");
                break;
        case IRQ_C0_NMI_L1_PARITY_ERR:
-               panic("NMI %d occurs unexpectedly");
+               panic("NMI occurs unexpectedly");
                break;
        default:
-               panic("Core 1 fault %d occurs unexpectedly");
+               panic("Core 1 fault occurs unexpectedly");
        }
 
        raw_spin_unlock(&desc->lock);