diff --git a/[refs] b/[refs]
index 9625d67fdc6d..520b4d7ae83c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 468fd62ed9090ccbe872489df5d0d099510df4b5
+refs/heads/master: 4016a1390d07f15b267eecb20e76a48fd5c524ef
diff --git a/trunk/mm/nommu.c b/trunk/mm/nommu.c
index 5d8ae086f74e..1d32fe89d57b 100644
--- a/trunk/mm/nommu.c
+++ b/trunk/mm/nommu.c
@@ -105,7 +105,11 @@ unsigned int kobjsize(const void *objp)
 {
 	struct page *page;
 
-	if (!objp || !((page = virt_to_page(objp))))
+	/*
+	 * If the object we have should not have ksize performed on it,
+	 * return size of 0
+	 */
+	if (!objp || (unsigned long)objp >= memory_end || !((page = virt_to_page(objp))))
 		return 0;
 
 	if (PageSlab(page))