[PATCH 2.6.21-rc1] sparc64: fix CONFIG_PCI_MSI=n compile failure

[PATCH 2.6.21-rc1] sparc64: fix CONFIG_PCI_MSI=n compile failure

[Mikael Pettersson]

2.6.21-rc1 fails to build on sparc64 when CONFIG_PCI_MSI=n:

  gcc -Wp,-MD,arch/sparc64/kernel/.irq.o.d  -nostdinc -isystem /home/mikpe/pkgs/linux-sparc64/gcc-4.1.2/lib/gcc/sparc64-unknown-linux-gnu/4.1.2/include -D__KERNEL__ -Iinclude  -include include/linux/autoconf.h -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Os -m64 -pipe -mno-fpu -mcpu=ultrasparc -mcmodel=medlow -ffixed-g4 -ffixed-g5 -fcall-used-g7 -Wno-sign-compare -Wa,--undeclared-regs -fomit-frame-pointer  -fno-stack-protector -Wdeclaration-after-statement -Wno-pointer-sign -Werror   -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(irq)"  -D"KBUILD_MODNAME=KBUILD_STR(irq)" -c -o arch/sparc64/kernel/irq.o arch/sparc64/kernel/irq.c
cc1: warnings being treated as errors
arch/sparc64/kernel/irq.c:113: warning: 'virt_irq_free' defined but not used
make[1]: *** [arch/sparc64/kernel/irq.o] Error 1
make: *** [arch/sparc64/kernel] Error 2

Most other MSI stuff in irq.c is #ifdef CONFIG_PCI_MSI.
So do the same for virt_irq_free() to fix this problem.

Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>

--- linux-2.6.21-rc1/arch/sparc64/kernel/irq.c.~1~	2007-02-26 17:47:54.000000000 +0100
+++ linux-2.6.21-rc1/arch/sparc64/kernel/irq.c	2007-02-26 18:01:55.000000000 +0100
@@ -109,6 +109,7 @@ static unsigned char virt_irq_alloc(unsi
 	return ent;
 }
 
+#ifdef CONFIG_PCI_MSI
 static void virt_irq_free(unsigned int virt_irq)
 {
 	unsigned int real_irq;
@@ -121,6 +122,7 @@ static void virt_irq_free(unsigned int v
 
 	__bucket(real_irq)->virt_irq = 0;
 }
+#endif
 
 static unsigned int virt_to_real_irq(unsigned char virt_irq)
 {

Re: [PATCH 2.6.21-rc1] sparc64: fix CONFIG_PCI_MSI=n compile failure

[David Miller]

From: Mikael Pettersson <mikpe@it.uu.se>
Date: Mon, 26 Feb 2007 19:54:08 +0100 (MET)

> 2.6.21-rc1 fails to build on sparc64 when CONFIG_PCI_MSI=n:

This is already fixed in my sparc-2.6 GIT tree as of a few
days ago, I'll push the fix to Linus later today.