aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMikael Pettersson <mikpe@csd.uu.se>2004-08-22 22:45:44 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-08-22 22:45:44 -0700
commit581851ea4953dfdb3b7b0037fec369cf06606a53 (patch)
treee770404f31f662f1ad662cffd35180db9f91d569 /arch
parent2f85be7d30a34f7b4919bbe3e68ec5f63634bd85 (diff)
downloadhistory-581851ea4953dfdb3b7b0037fec369cf06606a53.tar.gz
[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: Mikael Pettersson <mikpe@csd.uu.se> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/smp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/kernel/smp.c b/arch/i386/kernel/smp.c
index f0ebbedab21826..e12d63863d1d20 100644
--- a/arch/i386/kernel/smp.c
+++ b/arch/i386/kernel/smp.c
@@ -22,7 +22,6 @@
#include <asm/mtrr.h>
#include <asm/tlbflush.h>
-#include <mach_ipi.h>
#include <mach_apic.h>
/*
@@ -230,6 +229,8 @@ inline void send_IPI_mask_sequence(cpumask_t mask, int vector)
local_irq_restore(flags);
}
+#include <mach_ipi.h> /* must come after the send_IPI functions above for inlining */
+
/*
* Smarter SMP flushing macros.
* c/o Linus Torvalds.