diff --git a/[refs] b/[refs]
index 90523484ef3f..fe20811ff13e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0400b697ef20247d26427e4beb6a84ca5aa51f45
+refs/heads/master: 8ca3ed87db062201e1fa15b64a9214e193fc3a8a
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
index 3b3e1341163f..3f3ccfe42de0 100644
--- a/trunk/include/linux/mm.h
+++ b/trunk/include/linux/mm.h
@@ -235,6 +235,7 @@ static inline int get_page_unless_zero(struct page *page)
 struct page *vmalloc_to_page(const void *addr);
 unsigned long vmalloc_to_pfn(const void *addr);
 
+#ifdef CONFIG_MMU
 /* Determine if an address is within the vmalloc range */
 static inline int is_vmalloc_addr(const void *x)
 {
@@ -242,6 +243,7 @@ static inline int is_vmalloc_addr(const void *x)
 
 	return addr >= VMALLOC_START && addr < VMALLOC_END;
 }
+#endif
 
 static inline struct page *compound_head(struct page *page)
 {