X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Fasm-x86_64%2Ffixmap.h;h=7b286bd21d1dc5e641a72a282cbe92d432ec110e;hb=27266a18dc56611e2f2ec4e8aced0fe221e9b4b8;hp=a582cfcf2231a631564bac9aeda0a4422d8f0ca6;hpb=8d3ef7461c2460c1bc02c63279b638fae80bba37;p=powerpc.git

diff --git a/include/asm-x86_64/fixmap.h b/include/asm-x86_64/fixmap.h
index a582cfcf22..7b286bd21d 100644
--- a/include/asm-x86_64/fixmap.h
+++ b/include/asm-x86_64/fixmap.h
@@ -76,7 +76,7 @@ extern void __this_fixmap_does_not_exist(void);
  * directly without translation, 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,