patch-2.4.21 linux-2.4.21/arch/ia64/sn/kernel/irq.c

• Lines: 46
• Date: 2003-06-13 07:51:31.000000000 -0700
• Orig file: linux-2.4.20/arch/ia64/sn/kernel/irq.c
• Orig date: 2002-08-02 17:39:43.000000000 -0700

diff -urN linux-2.4.20/arch/ia64/sn/kernel/irq.c linux-2.4.21/arch/ia64/sn/kernel/irq.c
@@ -226,12 +226,6 @@
 	return (CPU_VECTOR_TO_IRQ(smp_processor_id(), vector));
 }
 
-int
-sn_valid_irq(u8 irq) {
-
-	return( ((irq & 0xff) < NR_IRQS) && ((irq >> 8) < NR_CPUS) );
-}
-
 void *kmalloc(size_t, int);
 
 void
@@ -240,7 +234,7 @@
 	int i;
 	irq_desc_t *base_desc = _irq_desc;
 
-	for (i=IA64_FIRST_DEVICE_VECTOR; i<NR_IRQS; i++) {
+	for (i=IA64_FIRST_DEVICE_VECTOR; i<NR_IVECS; i++) {
 		if (base_desc[i].handler == &no_irq_type) {
 			base_desc[i].handler = &irq_type_sn;
 		}
@@ -254,21 +248,14 @@
 
 	for (i=0; i < NR_CPUS; i++) {
 		p =  page_address(alloc_pages_node(local_cnodeid(), GFP_KERNEL,
-			get_order(sizeof(struct irq_desc) * NR_IRQS) ) );
+			get_order(sizeof(struct irq_desc) * NR_IVECS) ) );
 		ASSERT(p);
-		memcpy(p, base_desc, sizeof(struct irq_desc) * NR_IRQS);
+		memcpy(p, base_desc, sizeof(struct irq_desc) * NR_IVECS);
 		_sn_irq_desc[i] = p;
 	}
 }
 
 
-#if !defined(CONFIG_IA64_SGI_SN)
-void
-sn_pci_fixup(void)
-{
-}
-#endif
-
 int
 bit_pos_to_irq(int bit) {
 #define BIT_TO_IRQ 64