Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/tg3.c
	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/mac80211/ieee80211_i.h

1 files changed, 6 insertions, 2 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 63835579323a..8e83f02cd2d3 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1396,6 +1396,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 +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 {
@@ -3378,7 +3381,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