diff --git a/[refs] b/[refs]
index 78954fab2205..ac549a63824d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e5ef1a96e6e3b123da56292bc35017c8c401491
+refs/heads/master: d15c023b44e5d323f1f4130b85d29f08e43433b1
diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
index f523a1533ce1..37eaf42ed2c6 100644
--- a/trunk/mm/shmem.c
+++ b/trunk/mm/shmem.c
@@ -875,7 +875,7 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
 }
 
 #ifdef CONFIG_NUMA
-static int shmem_parse_mpol(char *value, int *policy, nodemask_t *policy_nodes)
+static inline int shmem_parse_mpol(char *value, int *policy, nodemask_t *policy_nodes)
 {
 	char *nodelist = strchr(value, ':');
 	int err = 1;