aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/irq.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sparc64/kernel/irq.c')
-rw-r--r--arch/sparc64/kernel/irq.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index 9b6689d9d570..52fc836f464d 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -7,6 +7,7 @@
7 7
8#include <linux/module.h> 8#include <linux/module.h>
9#include <linux/sched.h> 9#include <linux/sched.h>
10#include <linux/linkage.h>
10#include <linux/ptrace.h> 11#include <linux/ptrace.h>
11#include <linux/errno.h> 12#include <linux/errno.h>
12#include <linux/kernel_stat.h> 13#include <linux/kernel_stat.h>
@@ -28,7 +29,6 @@
28#include <asm/system.h> 29#include <asm/system.h>
29#include <asm/irq.h> 30#include <asm/irq.h>
30#include <asm/io.h> 31#include <asm/io.h>
31#include <asm/sbus.h>
32#include <asm/iommu.h> 32#include <asm/iommu.h>
33#include <asm/upa.h> 33#include <asm/upa.h>
34#include <asm/oplib.h> 34#include <asm/oplib.h>
@@ -792,6 +792,8 @@ void fixup_irqs(void)
792 } 792 }
793 spin_unlock_irqrestore(&irq_desc[irq].lock, flags); 793 spin_unlock_irqrestore(&irq_desc[irq].lock, flags);
794 } 794 }
795
796 tick_ops->disable_irq();
795} 797}
796#endif 798#endif
797 799
@@ -864,7 +866,7 @@ static void kill_prom_timer(void)
864 : "g1", "g2"); 866 : "g1", "g2");
865} 867}
866 868
867void init_irqwork_curcpu(void) 869void notrace init_irqwork_curcpu(void)
868{ 870{
869 int cpu = hard_smp_processor_id(); 871 int cpu = hard_smp_processor_id();
870 872
@@ -895,7 +897,7 @@ static void __cpuinit register_one_mondo(unsigned long paddr, unsigned long type
895 } 897 }
896} 898}
897 899
898void __cpuinit sun4v_register_mondo_queues(int this_cpu) 900void __cpuinit notrace sun4v_register_mondo_queues(int this_cpu)
899{ 901{
900 struct trap_per_cpu *tb = &trap_block[this_cpu]; 902 struct trap_per_cpu *tb = &trap_block[this_cpu];
901 903