Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758524AbZIOUjP (ORCPT ); Tue, 15 Sep 2009 16:39:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754210AbZIOUjH (ORCPT ); Tue, 15 Sep 2009 16:39:07 -0400 Received: from mk-filter-2-a-1.mail.uk.tiscali.com ([212.74.100.53]:9885 "EHLO mk-filter-2-a-1.mail.uk.tiscali.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750879AbZIOUjG (ORCPT ); Tue, 15 Sep 2009 16:39:06 -0400 X-Trace: 261987044/mk-filter-2.mail.uk.tiscali.com/B2C/$b2c-THROTTLED-DYNAMIC/b2c-CUSTOMER-DYNAMIC-IP/79.69.84.74/None/hugh.dickins@tiscali.co.uk X-SBRS: None X-RemoteIP: 79.69.84.74 X-IP-MAIL-FROM: hugh.dickins@tiscali.co.uk X-SMTP-AUTH: X-MUA: X-IP-BHB: Once X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AlgFALuYr0pPRVRK/2dsb2JhbACBU95lhBcF X-IronPort-AV: E=Sophos;i="4.44,391,1249254000"; d="scan'208";a="261987044" Date: Tue, 15 Sep 2009 21:38:21 +0100 (BST) From: Hugh Dickins X-X-Sender: hugh@sister.anvils To: Andrew Morton cc: KAMEZAWA Hiroyuki , KOSAKI Motohiro , Linus Torvalds , Nick Piggin , Rik van Riel , Mel Gorman , Minchan Kim , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 4/4] mm: move highest_memmap_pfn In-Reply-To: Message-ID: References: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1975 Lines: 56 Move highest_memmap_pfn __read_mostly from page_alloc.c next to zero_pfn __read_mostly in memory.c: to help them share a cacheline, since they're very often tested together in vm_normal_page(). Signed-off-by: Hugh Dickins --- mm/internal.h | 3 ++- mm/memory.c | 1 + mm/page_alloc.c | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) --- mm3/mm/internal.h 2009-09-14 16:34:37.000000000 +0100 +++ mm4/mm/internal.h 2009-09-15 17:32:27.000000000 +0100 @@ -37,6 +37,8 @@ static inline void __put_page(struct pag atomic_dec(&page->_count); } +extern unsigned long highest_memmap_pfn; + /* * in mm/vmscan.c: */ @@ -46,7 +48,6 @@ extern void putback_lru_page(struct page /* * in mm/page_alloc.c */ -extern unsigned long highest_memmap_pfn; extern void __free_pages_bootmem(struct page *page, unsigned int order); extern void prep_compound_page(struct page *page, unsigned long order); --- mm3/mm/memory.c 2009-09-15 17:32:19.000000000 +0100 +++ mm4/mm/memory.c 2009-09-15 17:32:27.000000000 +0100 @@ -108,6 +108,7 @@ static int __init disable_randmaps(char __setup("norandmaps", disable_randmaps); unsigned long zero_pfn __read_mostly; +unsigned long highest_memmap_pfn __read_mostly; /* * CONFIG_MMU architectures set up ZERO_PAGE in their paging_init() --- mm3/mm/page_alloc.c 2009-09-14 16:34:37.000000000 +0100 +++ mm4/mm/page_alloc.c 2009-09-15 17:32:27.000000000 +0100 @@ -72,7 +72,6 @@ EXPORT_SYMBOL(node_states); unsigned long totalram_pages __read_mostly; unsigned long totalreserve_pages __read_mostly; -unsigned long highest_memmap_pfn __read_mostly; int percpu_pagelist_fraction; gfp_t gfp_allowed_mask __read_mostly = GFP_BOOT_MASK; -- 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/