From 72925a4b1627709f3359435e1dc9b8158718f2b3 Mon Sep 17 00:00:00 2001 From: Kautuk Consul Date: Wed, 21 Mar 2012 16:34:15 -0700 Subject: [PATCH] --- yaml --- r: 292669 b: refs/heads/master c: b224ef856b1a5b949daff5937a9e187fe622b8f5 h: refs/heads/master i: 292667: 439e16a6de989734dfbb017a2026a1ed75ab7212 v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 77bbdda42888..bcbbb84000db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d13bddd11c10db40e2c81b4b224c11126691fc0 +refs/heads/master: b224ef856b1a5b949daff5937a9e187fe622b8f5 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 70bbd0f9c381..caea788628e4 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -4524,7 +4524,7 @@ static unsigned long __init early_calculate_totalpages(void) * memory. When they don't, some nodes will have more kernelcore than * others */ -static void __init find_zone_movable_pfns_for_nodes(unsigned long *movable_pfn) +static void __init find_zone_movable_pfns_for_nodes(void) { int i, nid; unsigned long usable_startpfn; @@ -4716,7 +4716,7 @@ void __init free_area_init_nodes(unsigned long *max_zone_pfn) /* Find the PFNs that ZONE_MOVABLE begins at in each node */ memset(zone_movable_pfn, 0, sizeof(zone_movable_pfn)); - find_zone_movable_pfns_for_nodes(zone_movable_pfn); + find_zone_movable_pfns_for_nodes(); /* Print out the zone ranges */ printk("Zone PFN ranges:\n");