diff --git a/[refs] b/[refs]
index 488ad53e76dd..4aa3ec4395c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92ca922f0a19145f2dcc99d84fe656fa55b52c2e
+refs/heads/master: aa91c4d898c062804f4d0a5da6d8ab013cd0e868
diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c
index 7e25ee3ce6e5..2bb90b1d241c 100644
--- a/trunk/mm/vmalloc.c
+++ b/trunk/mm/vmalloc.c
@@ -904,6 +904,14 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
 
 	BUG_ON(size & ~PAGE_MASK);
 	BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC);
+	if (WARN_ON(size == 0)) {
+		/*
+		 * Allocating 0 bytes isn't what caller wants since
+		 * get_order(0) returns funny result. Just warn and terminate
+		 * early.
+		 */
+		return NULL;
+	}
 	order = get_order(size);
 
 again: