From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755025AbZETHTR (ORCPT ); Wed, 20 May 2009 03:19:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752861AbZETHTG (ORCPT ); Wed, 20 May 2009 03:19:06 -0400 Received: from wf-out-1314.google.com ([209.85.200.168]:19353 "EHLO wf-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752811AbZETHTE (ORCPT ); Wed, 20 May 2009 03:19:04 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; b=wOBcPY2b07kUEpi4FJFzbk1bQXHQszGd/3lWYv3YEv7ayynL/TmIuUWiXXmqZDR2TA XkRIoT+DBRaquTWLRpsU0BcqzMjYxKcagjTBeWRYMKBeFe7R/zFUW2u4WunfjaRlGZKO Yl2/U6f985NCvp1mAcS9fYNXDS8/wRJZ8j7hg= Date: Wed, 20 May 2009 16:18:53 +0900 From: Minchan Kim To: Andrew Morton , LKML , linux-mm Cc: Mel Gorman , KOSAKI Motohiro , Rik van Riel , Johannes Weiner Subject: [PATCH 1/3] clean up setup_per_zone_pages_min Message-Id: <20090520161853.1bfd415c.minchan.kim@barrios-desktop> X-Mailer: Sylpheed 2.4.8 (GTK+ 2.12.9; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Mel changed zone->pages_[high/low/min] with zone->watermark array. So, setup_per_zone_pages_min also have to be changed. CC: Mel Gorman Signed-off-by: Minchan kim --- include/linux/mm.h | 2 +- mm/memory_hotplug.c | 2 +- mm/page_alloc.c | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index a569862..1b2cb16 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1058,7 +1058,7 @@ extern int __meminit __early_pfn_to_nid(unsigned long pfn); extern void set_dma_reserve(unsigned long new_dma_reserve); extern void memmap_init_zone(unsigned long, int, unsigned long, unsigned long, enum memmap_context); -extern void setup_per_zone_pages_min(void); +extern void setup_per_zone_wmark_min(void); extern void mem_init(void); extern void __init mmap_init(void); extern void show_mem(void); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index c083cf5..40bf385 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -422,7 +422,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages) zone->present_pages += onlined_pages; zone->zone_pgdat->node_present_pages += onlined_pages; - setup_per_zone_pages_min(); + setup_per_zone_wmark_min(); if (onlined_pages) { kswapd_run(zone_to_nid(zone)); node_set_state(zone_to_nid(zone), N_HIGH_MEMORY); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 9c712f0..273526b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -4471,12 +4471,12 @@ static void setup_per_zone_lowmem_reserve(void) } /** - * setup_per_zone_pages_min - called when min_free_kbytes changes. + * setup_per_zone_wmark_min - called when min_free_kbytes changes. * - * Ensures that the pages_{min,low,high} values for each zone are set correctly + * Ensures that the watermark[min,low,high] values for each zone are set correctly * with respect to min_free_kbytes. */ -void setup_per_zone_pages_min(void) +void setup_per_zone_wmark_min(void) { unsigned long pages_min = min_free_kbytes >> (PAGE_SHIFT - 10); unsigned long lowmem_pages = 0; @@ -4594,7 +4594,7 @@ static void __init setup_per_zone_inactive_ratio(void) * 8192MB: 11584k * 16384MB: 16384k */ -static int __init init_per_zone_pages_min(void) +static int __init init_per_zone_wmark_min(void) { unsigned long lowmem_kbytes; @@ -4605,12 +4605,12 @@ static int __init init_per_zone_pages_min(void) min_free_kbytes = 128; if (min_free_kbytes > 65536) min_free_kbytes = 65536; - setup_per_zone_pages_min(); + setup_per_zone_wmark_min(); setup_per_zone_lowmem_reserve(); setup_per_zone_inactive_ratio(); return 0; } -module_init(init_per_zone_pages_min) +module_init(init_per_zone_wmark_min) /* * min_free_kbytes_sysctl_handler - just a wrapper around proc_dointvec() so @@ -4622,7 +4622,7 @@ int min_free_kbytes_sysctl_handler(ctl_table *table, int write, { proc_dointvec(table, write, file, buffer, length, ppos); if (write) - setup_per_zone_pages_min(); + setup_per_zone_wmark_min(); return 0; } -- 1.5.4.3 -- Kinds Regards Minchan Kim