Merge remote-tracking branch 'asoc/fix/ep93xx' into asoc-linus

[~andy/linux] / arch / tile / kernel / messaging.c

diff --git a/arch/tile/kernel/messaging.c b/arch/tile/kernel/messaging.c
index 997e3933f72679718583dae5a82c72c4d2f9fbdb..00331af9525dcf52c990f3ee30abb13d367d7889 100644 (file)
--- a/arch/tile/kernel/messaging.c
+++ b/arch/tile/kernel/messaging.c
@@ -25,7 +25,7 @@
 /* All messages are stored here */
 static DEFINE_PER_CPU(HV_MsgState, msg_state);
 
-void __cpuinit init_messaging(void)
+void init_messaging(void)
 {
        /* Allocate storage for messages in kernel space */
        HV_MsgState *state = &__get_cpu_var(msg_state);
@@ -34,7 +34,7 @@ void __cpuinit init_messaging(void)
                panic("hv_register_message_state: error %d", rc);
 
        /* Make sure downcall interrupts will be enabled. */
-       raw_local_irq_unmask(INT_INTCTRL_K);
+       arch_local_irq_unmask(INT_INTCTRL_K);
 }
 
 void hv_message_intr(struct pt_regs *regs, int intnum)