[Linux-ia64] [PATCH?] Compile fixes for UP ia64 - IRQ stuff (RESEND)

[Linux-ia64] [PATCH?] Compile fixes for UP ia64 - IRQ stuff (RESEND)

[Francis Galiegue]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 809 bytes --]

[same as previous mail... Sent 6 hrs ago but did not arrive]

OK, I've found what was wrong... Attached patch is over 2.4.2 plus 010228
patch, and it fixes the following:

- include/asm-ia64/hardirq.h: invalid local_irq_count() usage in
  local_enter_irq()
- arch/ia64/kernel/irq_ia64.c: IPI was registered on UP also, but I don't think
  it's used at all (or is it?), and what's more ipi_irqaction definition is
  surrounded by #ifdef CONFIG_SMP .. #endif. So I also #ifdef'ed the IPI
  registering out.

WDYT?

-- 
Francis Galiegue, fg@mandrakesoft.com - Normand et fier de l'être
"Programming is a race between programmers, who try and make more and more
idiot-proof software, and universe, which produces more and more remarkable
idiots. Until now, universe leads the race"  -- R. Cook

[-- Attachment #2: Type: TEXT/PLAIN, Size: 1152 bytes --]

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