aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndi Kleen <ak@muc.de>2004-08-22 22:43:38 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-08-22 22:43:38 -0700
commitb1b58955f7de4c8847419ebe0d617e91b353bdf4 (patch)
tree9e2aaef1893e3fd26022394f80eabf6eb9973db0 /include
parent0e44d282e84a0895485cfcf0fa60a494b6a7cc15 (diff)
downloadhistory-b1b58955f7de4c8847419ebe0d617e91b353bdf4.tar.gz
[PATCH] gcc-3.5: fixmap.h fix
Not strictly needed, since we're forcing `inline' to always_inline, but it's good for documentation purposes - This function needs the always_inline otherwise you get a link error when the compile time test is not optimized away. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-i386/fixmap.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/fixmap.h b/include/asm-i386/fixmap.h
index 07d4c64ae02c72..791faa169b8367 100644
--- a/include/asm-i386/fixmap.h
+++ b/include/asm-i386/fixmap.h
@@ -125,7 +125,7 @@ extern void __this_fixmap_does_not_exist(void);
* directly without tranlation, we catch the bug with a NULL-deference
* kernel oops. Illegal ranges of incoming indices are caught too.
*/
-static inline unsigned long fix_to_virt(const unsigned int idx)
+static __always_inline unsigned long fix_to_virt(const unsigned int idx)
{
/*
* this branch gets completely eliminated after inlining,