diff -urN linux-old/arch/ia64/kernel/irq_ia64.c linux/arch/ia64/kernel/irq_ia64.c
--- linux-old/arch/ia64/kernel/irq_ia64.c	Thu Mar  1 06:54:17 2001
+++ linux/arch/ia64/kernel/irq_ia64.c	Thu Mar  1 07:10:06 2001
@@ -155,7 +155,9 @@
 init_IRQ (void)
 {
 	register_percpu_irq(IA64_SPURIOUS_INT_VECTOR, NULL);
+#ifdef CONFIG_SMP
 	register_percpu_irq(IA64_IPI_VECTOR, &ipi_irqaction);
+#endif
 	platform_irq_init();
 }
 
Binary files linux-old/arch/ia64/tools/print_offsets and linux/arch/ia64/tools/print_offsets differ
diff -urN linux-old/include/asm-ia64/hardirq.h linux/include/asm-ia64/hardirq.h
--- linux-old/include/asm-ia64/hardirq.h	Thu Mar  1 06:54:19 2001
+++ linux/include/asm-ia64/hardirq.h	Thu Mar  1 07:06:42 2001
@@ -41,8 +41,8 @@
 # define local_hardirq_trylock()	(local_irq_count() == 0)
 # define local_hardirq_endlock()	do { } while (0)
 
-# define local_irq_enter(irq)		(local_irq_count(cpu)++)
-# define local_irq_exit(irq)		(local_irq_count(cpu)--)
+# define local_irq_enter(irq)		(local_irq_count()++)
+# define local_irq_exit(irq)		(local_irq_count()--)
 
 # define synchronize_irq()		barrier()
 #else