diff --git a/[refs] b/[refs]
index ffd393ac2e87..a7f1693a5591 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7eb54824b76793dd86afb54f182ef9aa64b3a45a
+refs/heads/master: cd94b9dbfa300fc42e45f230010623fc08d59563
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 7f4c66ff65b7..8e83f02cd2d3 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -2807,7 +2807,7 @@ int zone_wait_table_init(struct zone *zone, unsigned long zone_size_pages)
 	alloc_size = zone->wait_table_hash_nr_entries
 					* sizeof(wait_queue_head_t);
 
- 	if (system_state == SYSTEM_BOOTING) {
+	if (!slab_is_available()) {
 		zone->wait_table = (wait_queue_head_t *)
 			alloc_bootmem_node(pgdat, alloc_size);
 	} else {