Commit 581851ea authored by Mikael Pettersson's avatar Mikael Pettersson Committed by Linus Torvalds

[PATCH] arch/i386/kernel/smp.c gcc341 inlining fix

gcc-3.4.1 errors out in 2.6.8-rc1-mm1 at arch/i386/kernel/smp.c:

arch/i386/kernel/smp.c: In function `flush_tlb_others':
arch/i386/kernel/smp.c:161: sorry, unimplemented: inlining failed in call to 'send_IPI_mask_bitmask': function not considered for inlining
arch/i386/kernel/smp.c:9: sorry, unimplemented: called from here
make[1]: *** [arch/i386/kernel/smp.o] Error 1
make: *** [arch/i386/kernel] Error 2

The <mach_ipi.h> inlines depend on functions defined further down in smp.c.
 Moving the #include eliminates the problem.
Signed-off-by: default avatarMikael Pettersson <mikpe@csd.uu.se>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2f85be7d
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <asm/mtrr.h> #include <asm/mtrr.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <mach_ipi.h>
#include <mach_apic.h> #include <mach_apic.h>
/* /*
...@@ -230,6 +229,8 @@ inline void send_IPI_mask_sequence(cpumask_t mask, int vector) ...@@ -230,6 +229,8 @@ inline void send_IPI_mask_sequence(cpumask_t mask, int vector)
local_irq_restore(flags); local_irq_restore(flags);
} }
#include <mach_ipi.h> /* must come after the send_IPI functions above for inlining */
/* /*
* Smarter SMP flushing macros. * Smarter SMP flushing macros.
* c/o Linus Torvalds. * c/o Linus Torvalds.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment