aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/hp/sim/hpsim_irq.c1
-rw-r--r--arch/ia64/kernel/iosapic.c2
-rw-r--r--arch/ia64/kernel/irq_lsapic.c1
-rw-r--r--arch/ia64/sn/kernel/irq.c23
4 files changed, 0 insertions, 27 deletions
diff --git a/arch/ia64/hp/sim/hpsim_irq.c b/arch/ia64/hp/sim/hpsim_irq.c
index b272261d77cc..4a1d5fafdf9d 100644
--- a/arch/ia64/hp/sim/hpsim_irq.c
+++ b/arch/ia64/hp/sim/hpsim_irq.c
@@ -34,7 +34,6 @@ static struct irq_chip irq_type_hp_sim = {
34 .enable = hpsim_irq_noop, 34 .enable = hpsim_irq_noop,
35 .disable = hpsim_irq_noop, 35 .disable = hpsim_irq_noop,
36 .ack = hpsim_irq_noop, 36 .ack = hpsim_irq_noop,
37 .end = hpsim_irq_noop,
38 .set_affinity = hpsim_set_affinity_noop, 37 .set_affinity = hpsim_set_affinity_noop,
39}; 38};
40 39
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index 22c38404f539..d21f9af8170e 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -460,7 +460,6 @@ iosapic_ack_edge_irq (unsigned int irq)
460 460
461#define iosapic_enable_edge_irq unmask_irq 461#define iosapic_enable_edge_irq unmask_irq
462#define iosapic_disable_edge_irq nop 462#define iosapic_disable_edge_irq nop
463#define iosapic_end_edge_irq nop
464 463
465static struct irq_chip irq_type_iosapic_edge = { 464static struct irq_chip irq_type_iosapic_edge = {
466 .name = "IO-SAPIC-edge", 465 .name = "IO-SAPIC-edge",
@@ -469,7 +468,6 @@ static struct irq_chip irq_type_iosapic_edge = {
469 .enable = iosapic_enable_edge_irq, 468 .enable = iosapic_enable_edge_irq,
470 .disable = iosapic_disable_edge_irq, 469 .disable = iosapic_disable_edge_irq,
471 .ack = iosapic_ack_edge_irq, 470 .ack = iosapic_ack_edge_irq,
472 .end = iosapic_end_edge_irq,
473 .mask = mask_irq, 471 .mask = mask_irq,
474 .unmask = unmask_irq, 472 .unmask = unmask_irq,
475 .set_affinity = iosapic_set_affinity 473 .set_affinity = iosapic_set_affinity
diff --git a/arch/ia64/kernel/irq_lsapic.c b/arch/ia64/kernel/irq_lsapic.c
index fc1549d4564d..a50dffa85d0b 100644
--- a/arch/ia64/kernel/irq_lsapic.c
+++ b/arch/ia64/kernel/irq_lsapic.c
@@ -40,6 +40,5 @@ struct irq_chip irq_type_ia64_lsapic = {
40 .enable = lsapic_noop, 40 .enable = lsapic_noop,
41 .disable = lsapic_noop, 41 .disable = lsapic_noop,
42 .ack = lsapic_noop, 42 .ack = lsapic_noop,
43 .end = lsapic_noop,
44 .retrigger = lsapic_retrigger, 43 .retrigger = lsapic_retrigger,
45}; 44};
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index 13c15d968098..658c716283ce 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -114,28 +114,6 @@ static void sn_ack_irq(unsigned int irq)
114 move_native_irq(irq); 114 move_native_irq(irq);
115} 115}
116 116
117static void sn_end_irq(unsigned int irq)
118{
119 int ivec;
120 u64 event_occurred;
121
122 ivec = irq & 0xff;
123 if (ivec == SGI_UART_VECTOR) {
124 event_occurred = HUB_L((u64*)LOCAL_MMR_ADDR (SH_EVENT_OCCURRED));
125 /* If the UART bit is set here, we may have received an
126 * interrupt from the UART that the driver missed. To
127 * make sure, we IPI ourselves to force us to look again.
128 */
129 if (event_occurred & SH_EVENT_OCCURRED_UART_INT_MASK) {
130 platform_send_ipi(smp_processor_id(), SGI_UART_VECTOR,
131 IA64_IPI_DM_INT, 0);
132 }
133 }
134 __clear_bit(ivec, (volatile void *)pda->sn_in_service_ivecs);
135 if (sn_force_interrupt_flag)
136 force_interrupt(irq);
137}
138
139static void sn_irq_info_free(struct rcu_head *head); 117static void sn_irq_info_free(struct rcu_head *head);
140 118
141struct sn_irq_info *sn_retarget_vector(struct sn_irq_info *sn_irq_info, 119struct sn_irq_info *sn_retarget_vector(struct sn_irq_info *sn_irq_info,
@@ -275,7 +253,6 @@ struct irq_chip irq_type_sn = {
275 .enable = sn_enable_irq, 253 .enable = sn_enable_irq,
276 .disable = sn_disable_irq, 254 .disable = sn_disable_irq,
277 .ack = sn_ack_irq, 255 .ack = sn_ack_irq,
278 .end = sn_end_irq,
279 .mask = sn_mask_irq, 256 .mask = sn_mask_irq,
280 .unmask = sn_unmask_irq, 257 .unmask = sn_unmask_irq,
281 .set_affinity = sn_set_affinity_irq 258 .set_affinity = sn_set_affinity_irq