Merge branch 'ocelot-vcap-fixes'

[linux-2.6-microblaze.git] / lib / strncpy_from_user.c

diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
index 08fc72d..6432b8c 100644 (file)
--- a/lib/strncpy_from_user.c
+++ b/lib/strncpy_from_user.c
@@ -25,7 +25,7 @@
  * hit it), 'max' is the address space maximum (and we return
  * -EFAULT if we hit it).
  */
-static inline long do_strncpy_from_user(char *dst, const char __user *src,
+static __always_inline long do_strncpy_from_user(char *dst, const char __user *src,
                                        unsigned long count, unsigned long max)
 {
        const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;