From: Christian Kujau <evil@g-house.de>

      CC      drivers/pci/msi-apic.o
In file included from include/asm/msi.h:11,
                  from drivers/pci/msi.h:71,
                  from drivers/pci/msi-apic.c:8:
include/asm/smp.h:103: error: syntax error before '->' token

akpm: nasty.  It appears to be

static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)

conflicting with include/asm-x86_64/mach_apic.h's

#define cpu_mask_to_apicid (genapic->cpu_mask_to_apicid)

And I don't know which patch in rc4-mm1 triggered this.

Fixing this in the .c file seems wrong.

Including asm/smp.h instead of linux/smp.h seems wrong too.  Need that
.config.


Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/pci/msi-apic.c |    1 +
 1 file changed, 1 insertion(+)

diff -puN drivers/pci/msi-apic.c~x86_64-msi-apic-build-fix drivers/pci/msi-apic.c
--- devel/drivers/pci/msi-apic.c~x86_64-msi-apic-build-fix	2006-06-09 00:42:51.000000000 -0700
+++ devel-akpm/drivers/pci/msi-apic.c	2006-06-09 00:42:51.000000000 -0700
@@ -4,6 +4,7 @@
 
 #include <linux/pci.h>
 #include <linux/irq.h>
+#include <asm/smp.h>
 
 #include "msi.h"
 
_