From f36fb1a905857776f7d15af3ed2dc076ff6e955c Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 12 Mar 2008 16:51:31 +0900
Subject: [PATCH] --- yaml --- r: 87175 b: refs/heads/master c:
 0738c4bb8f2a8bf15178f852494643b0981f578b h: refs/heads/master i:   87173:
 c5d5ac8cf4ed940f8f17bfed11d571567c9d7740   87171:
 fb7adfb42e7e3824150a0ffbde4c1b7fb36fa3ff   87167:
 fdc36f69c240e2db80c0f07da386a53178bd4cd5 v: v3

---
 [refs]                   |  2 +-
 trunk/include/linux/mm.h | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 13f601ded96d..36b24d4eaacc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: baadac8b10c5ac15ce3d26b68fa266c8889b163f
+refs/heads/master: 0738c4bb8f2a8bf15178f852494643b0981f578b
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
index 3f3ccfe42de0..b695875d63e3 100644
--- a/trunk/include/linux/mm.h
+++ b/trunk/include/linux/mm.h
@@ -235,15 +235,22 @@ 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 */
+/*
+ * Determine if an address is within the vmalloc range
+ *
+ * On nommu, vmalloc/vfree wrap through kmalloc/kfree directly, so there
+ * is no special casing required.
+ */
 static inline int is_vmalloc_addr(const void *x)
 {
+#ifdef CONFIG_MMU
 	unsigned long addr = (unsigned long)x;
 
 	return addr >= VMALLOC_START && addr < VMALLOC_END;
-}
+#else
+	return 0;
 #endif
+}
 
 static inline struct page *compound_head(struct page *page)
 {