diff -u -r 10_early_printk/arch/ia64/kernel/ia64_ksyms.c 20_iosapic_gsi/arch/ia64/kernel/ia64_ksyms.c
--- 10_early_printk/arch/ia64/kernel/ia64_ksyms.c	Sat Jul 20 16:31:07 2002
+++ 20_iosapic_gsi/arch/ia64/kernel/ia64_ksyms.c	Sat Jul 20 16:32:16 2002
@@ -28,7 +28,6 @@
 
 #include <linux/irq.h>
 EXPORT_SYMBOL(isa_irq_to_vector_map);
-EXPORT_SYMBOL(gsi_to_vector_map);
 EXPORT_SYMBOL(enable_irq);
 EXPORT_SYMBOL(disable_irq);
 EXPORT_SYMBOL(disable_irq_nosync);
diff -u -r 10_early_printk/arch/ia64/kernel/iosapic.c 20_iosapic_gsi/arch/ia64/kernel/iosapic.c
--- 10_early_printk/arch/ia64/kernel/iosapic.c	Sat Jul 20 16:31:07 2002
+++ 20_iosapic_gsi/arch/ia64/kernel/iosapic.c	Sat Jul 20 16:32:16 2002
@@ -421,7 +421,6 @@
 	irq_desc_t *idesc;
 	struct hw_interrupt_type *irq_type;
 
-	gsi_to_vector(global_vector) = vector;
 	iosapic_irq[vector].pin	= pin;
 	iosapic_irq[vector].polarity = polarity ? IOSAPIC_POL_HIGH : IOSAPIC_POL_LOW;
 	iosapic_irq[vector].dmode    = delivery;
diff -u -r 10_early_printk/arch/ia64/kernel/irq_ia64.c 20_iosapic_gsi/arch/ia64/kernel/irq_ia64.c
--- 10_early_printk/arch/ia64/kernel/irq_ia64.c	Sat Jul 20 16:31:07 2002
+++ 20_iosapic_gsi/arch/ia64/kernel/irq_ia64.c	Sat Jul 20 16:32:16 2002
@@ -54,11 +54,6 @@
 	0x28, 0x27, 0x26, 0x25, 0x24, 0x23, 0x22, 0x21
 };
 
-/*
- * GSI to IA-64 vector translation table.
- */
-__u8 gsi_to_vector_map[255];
-
 int
 ia64_alloc_irq (void)
 {
diff -u -r 10_early_printk/drivers/acpi/osl.c 20_iosapic_gsi/drivers/acpi/osl.c
--- 10_early_printk/drivers/acpi/osl.c	Sat Jul 20 16:31:08 2002
+++ 20_iosapic_gsi/drivers/acpi/osl.c	Sat Jul 20 16:32:16 2002
@@ -235,7 +235,7 @@
 acpi_os_install_interrupt_handler(u32 irq, OSD_HANDLER handler, void *context)
 {
 #ifdef CONFIG_IA64
-	irq = gsi_to_vector(irq);
+	irq = isa_irq_to_vector(irq);
 #endif /* CONFIG_IA64 */
 	acpi_irq_irq = irq;
 	acpi_irq_handler = handler;
@@ -253,7 +253,7 @@
 {
 	if (acpi_irq_handler) {
 #ifdef CONFIG_IA64
-		irq = gsi_to_vector(irq);
+		irq = isa_irq_to_vector(irq);
 #endif /* CONFIG_IA64 */
 		free_irq(irq, acpi_irq);
 		acpi_irq_handler = NULL;
diff -u -r 10_early_printk/include/asm-ia64/hw_irq.h 20_iosapic_gsi/include/asm-ia64/hw_irq.h
--- 10_early_printk/include/asm-ia64/hw_irq.h	Sat Jul 20 16:31:09 2002
+++ 20_iosapic_gsi/include/asm-ia64/hw_irq.h	Sat Jul 20 16:32:16 2002
@@ -67,8 +67,6 @@
 
 extern __u8 isa_irq_to_vector_map[16];
 #define isa_irq_to_vector(x)	isa_irq_to_vector_map[(x)]
-extern __u8 gsi_to_vector_map[255];
-#define gsi_to_vector(x)	gsi_to_vector_map[(x)]
 
 extern unsigned long ipi_base_addr;