Revert "mm: slowly shrink slabs with a relatively small number of objects"

[linux-2.6-microblaze.git] / mm / mm_init.c

diff --git a/mm/mm_init.c b/mm/mm_init.c
index 5b72266..3391710 100644 (file)
--- a/mm/mm_init.c
+++ b/mm/mm_init.c
@@ -53,13 +53,8 @@ void __init mminit_verify_zonelist(void)
                                zone->name);
 
                        /* Iterate the zonelist */
-                       for_each_zone_zonelist(zone, z, zonelist, zoneid) {
-#ifdef CONFIG_NUMA
-                               pr_cont("%d:%s ", zone->node, zone->name);
-#else
-                               pr_cont("0:%s ", zone->name);
-#endif /* CONFIG_NUMA */
-                       }
+                       for_each_zone_zonelist(zone, z, zonelist, zoneid)
+                               pr_cont("%d:%s ", zone_to_nid(zone), zone->name);
                        pr_cont("\n");
                }
        }
@@ -151,7 +146,7 @@ static void __meminit mm_compute_batch(void)
        s32 batch = max_t(s32, nr*2, 32);
 
        /* batch size set to 0.4% of (total memory/#cpus), or max int32 */
-       memsized_batch = min_t(u64, (totalram_pages/nr)/256, 0x7fffffff);
+       memsized_batch = min_t(u64, (totalram_pages()/nr)/256, 0x7fffffff);
 
        vm_committed_as_batch = max_t(s32, memsized_batch, batch);
 }