1 files changed, 9 insertions, 33 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 63835579323a..2f552955a02f 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -237,16 +237,7 @@ static void bad_page(struct page *page)
         printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n"
                 KERN_EMERG "Backtrace:\n");
         dump_stack();
-        page->flags &= ~(1 << PG_lru    |
-                        1 << PG_private |
-                        1 << PG_locked  |
-                        1 << PG_active  |
-                        1 << PG_dirty   |
-                        1 << PG_reclaim |
-                        1 << PG_slab    |
-                        1 << PG_swapcache |
-                        1 << PG_writeback |
-                        1 << PG_buddy );
+        page->flags &= ~PAGE_FLAGS_CLEAR_WHEN_BAD;
         set_page_count(page, 0);
         reset_page_mapcount(page);
         page->mapping = NULL;
@@ -463,16 +454,7 @@ static inline int free_pages_check(struct page *page)
                 (page->mapping != NULL)  |
                 (page_get_page_cgroup(page) != NULL) |
                 (page_count(page) != 0)  |
-                (page->flags & (
-                        1 << PG_lru     |
-                        1 << PG_private |
-                        1 << PG_locked  |
-                        1 << PG_active  |
-                        1 << PG_slab    |
-                        1 << PG_swapcache |
-                        1 << PG_writeback |
-                        1 << PG_reserved |
-                        1 << PG_buddy ))))
+                (page->flags & PAGE_FLAGS_CHECK_AT_FREE)))
                 bad_page(page);
         if (PageDirty(page))
                 __ClearPageDirty(page);
@@ -616,17 +598,7 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
                 (page->mapping != NULL)  |
                 (page_get_page_cgroup(page) != NULL) |
                 (page_count(page) != 0)  |
-                (page->flags & (
-                        1 << PG_lru     |
-                        1 << PG_private |
-                        1 << PG_locked  |
-                        1 << PG_active  |
-                        1 << PG_dirty   |
-                        1 << PG_slab    |
-                        1 << PG_swapcache |
-                        1 << PG_writeback |
-                        1 << PG_reserved |
-                        1 << PG_buddy ))))
+                (page->flags & PAGE_FLAGS_CHECK_AT_PREP)))
                 bad_page(page);
 
         /*
@@ -1396,6 +1368,9 @@ get_page_from_freelist(gfp_t gfp_mask, nodemask_t *nodemask, unsigned int order,
 
         (void)first_zones_zonelist(zonelist, high_zoneidx, nodemask,
                                                         &preferred_zone);
+        if (!preferred_zone)
+                return NULL;
+
         classzone_idx = zone_idx(preferred_zone);
 
 zonelist_scan:
@@ -2804,7 +2779,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 {
@@ -3378,7 +3353,8 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat,
                  * is used by this zone for memmap. This affects the watermark
                  * and per-cpu initialisations
                  */
-                memmap_pages = (size * sizeof(struct page)) >> PAGE_SHIFT;
+                memmap_pages =
+                        PAGE_ALIGN(size * sizeof(struct page)) >> PAGE_SHIFT;
                 if (realsize >= memmap_pages) {
                         realsize -= memmap_pages;
                         printk(KERN_DEBUG