Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763997AbYCGJKi (ORCPT ); Fri, 7 Mar 2008 04:10:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761678AbYCGJH3 (ORCPT ); Fri, 7 Mar 2008 04:07:29 -0500 Received: from smtp-out03.alice-dsl.net ([88.44.63.5]:62722 "EHLO smtp-out03.alice-dsl.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760603AbYCGJHW (ORCPT ); Fri, 7 Mar 2008 04:07:22 -0500 From: Andi Kleen References: <200803071007.493903088@firstfloor.org> In-Reply-To: <200803071007.493903088@firstfloor.org> To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH] [9/13] Remove set_dma_reserve Message-Id: <20080307090719.AA15E1B419C@basil.firstfloor.org> Date: Fri, 7 Mar 2008 10:07:19 +0100 (CET) X-OriginalArrivalTime: 07 Mar 2008 09:00:49.0415 (UTC) FILETIME=[BD160970:01C88031] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2882 Lines: 76 x86 was the only user and that one doesn't use it anymore since it was converted to mask alloc. So remove it. Signed-off-by: Andi Kleen --- include/linux/mm.h | 1 - mm/page_alloc.c | 24 ------------------------ 2 files changed, 25 deletions(-) Index: linux/mm/page_alloc.c =================================================================== --- linux.orig/mm/page_alloc.c +++ linux/mm/page_alloc.c @@ -120,7 +120,6 @@ int min_free_kbytes = 1024; unsigned long __meminitdata nr_kernel_pages; unsigned long __meminitdata nr_all_pages; -static unsigned long __meminitdata dma_reserve; #ifdef CONFIG_ARCH_POPULATES_NODE_MAP /* @@ -3321,13 +3320,6 @@ static void __paginginit free_area_init_ " %s zone: %lu pages exceeds realsize %lu\n", zone_names[j], memmap_pages, realsize); - /* Account for reserved pages */ - if (j == 0 && realsize > dma_reserve) { - realsize -= dma_reserve; - printk(KERN_DEBUG " %s zone: %lu pages reserved\n", - zone_names[0], dma_reserve); - } - if (!is_highmem_idx(j)) nr_kernel_pages += realsize; nr_all_pages += realsize; @@ -3906,22 +3898,6 @@ early_param("movablecore", cmdline_parse #endif /* CONFIG_ARCH_POPULATES_NODE_MAP */ -/** - * set_dma_reserve - set the specified number of pages reserved in the first zone - * @new_dma_reserve: The number of pages to mark reserved - * - * The per-cpu batchsize and zone watermarks are determined by present_pages. - * In the DMA zone, a significant percentage may be consumed by kernel image - * and other unfreeable allocations which can skew the watermarks badly. This - * function may optionally be used to account for unfreeable pages in the - * first zone (e.g., ZONE_DMA). The effect will be lower watermarks and - * smaller per-cpu batchsize. - */ -void __init set_dma_reserve(unsigned long new_dma_reserve) -{ - dma_reserve = new_dma_reserve; -} - #ifndef CONFIG_NEED_MULTIPLE_NODES static bootmem_data_t contig_bootmem_data; struct pglist_data contig_page_data = { .bdata = &contig_bootmem_data }; Index: linux/include/linux/mm.h =================================================================== --- linux.orig/include/linux/mm.h +++ linux/include/linux/mm.h @@ -987,7 +987,6 @@ extern void sparse_memory_present_with_a extern int early_pfn_to_nid(unsigned long pfn); #endif /* CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID */ #endif /* CONFIG_ARCH_POPULATES_NODE_MAP */ -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); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/