• Christian Kujau's avatar
    [PATCH] x86_64: msi_apic.c build fix · a4cffb64
    Christian Kujau authored
          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: default avatarAndrew Morton <akpm@osdl.org>
    Signed-off-by: default avatarAndi Kleen <ak@suse.de>
    Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
    a4cffb64
msi-apic.c 2.34 KB