diff options
| author | Christian Kujau <evil@g-house.de> | 2006-06-26 14:00:02 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 19:48:22 +0200 |
| commit | a4cffb6444c327677f901323ecf1a13d6bd2df3f (patch) | |
| tree | aa3a2ca547dc6e232a3784cd65897b3bd77029da /drivers/pci | |
| parent | [PATCH] x86_64: i386/x86-64 Add nmi watchdog support for new Intel CPUs (diff) | |
| download | linux-a4cffb6444c327677f901323ecf1a13d6bd2df3f.tar.xz linux-a4cffb6444c327677f901323ecf1a13d6bd2df3f.zip | |
[PATCH] x86_64: msi_apic.c build fix
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>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/msi-apic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/msi-apic.c b/drivers/pci/msi-apic.c index 0eb5fe9003a2..5ed798b319c7 100644 --- a/drivers/pci/msi-apic.c +++ b/drivers/pci/msi-apic.c @@ -4,6 +4,7 @@ #include <linux/pci.h> #include <linux/irq.h> +#include <asm/smp.h> #include "msi.h" |