diff --git a/[refs] b/[refs]
index 6a1375be68ae..c158dbb5fb03 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9a929dde3913780b5c416f4bb9d9ed804f509ce
+refs/heads/master: 3bcfeaf93f44112053e1c36aa681d9efc1185ddc
diff --git a/trunk/mm/bounce.c b/trunk/mm/bounce.c
index 1481de68184b..434fb4f0c5e4 100644
--- a/trunk/mm/bounce.c
+++ b/trunk/mm/bounce.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/hash.h>
 #include <linux/highmem.h>
+#include <linux/bootmem.h>
 #include <asm/tlbflush.h>
 
 #include <trace/events/block.h>
@@ -26,12 +27,10 @@ static mempool_t *page_pool, *isa_page_pool;
 #ifdef CONFIG_HIGHMEM
 static __init int init_emergency_pool(void)
 {
-	struct sysinfo i;
-	si_meminfo(&i);
-	si_swapinfo(&i);
-
-	if (!i.totalhigh)
+#ifndef CONFIG_MEMORY_HOTPLUG
+	if (max_pfn <= max_low_pfn)
 		return 0;
+#endif
 
 	page_pool = mempool_create_page_pool(POOL_SIZE, 0);
 	BUG_ON(!page_pool);