diff --git a/[refs] b/[refs]
index d257ee7b83d4..7dff2153a605 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 645d83c5db970a1c57225e155113b4aa2451e920
+refs/heads/master: 934831d060ccd5471ecbc562804a8d3ccd6e562c
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
index df08551cb0ad..24c395694f4d 100644
--- a/trunk/include/linux/mm.h
+++ b/trunk/include/linux/mm.h
@@ -288,7 +288,7 @@ static inline int is_vmalloc_addr(const void *x)
 #ifdef CONFIG_MMU
 extern int is_vmalloc_or_module_addr(const void *x);
 #else
-static int is_vmalloc_or_module_addr(const void *x)
+static inline int is_vmalloc_or_module_addr(const void *x)
 {
 	return 0;
 }