From: Matt Tolentino <metolent@snoqualmie.dp.intel.com>
To: ak@muc.de, akpm@osdl.org
Cc: apw@shadowen.org, haveblue@us.ibm.com,
linux-kernel@vger.kernel.org, linux-mm@kvack.org
Subject: [patch 1/4] remove direct ref to contig_page_data for x86-64
Date: Wed, 18 May 2005 08:23:07 -0700 [thread overview]
Message-ID: <200505181523.j4IFN7rs026902@snoqualmie.dp.intel.com> (raw)
This patch pulls out all remaining direct references to
contig_page_data from arch/x86-64, thus saving an ifdef
in one case.
Signed-off-by: Matt Tolentino <matthew.e.tolentino@intel.com>
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---
arch/x86_64/kernel/aperture.c | 4 ----
arch/x86_64/kernel/setup.c | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff -urNp linux-2.6.12-rc4-mm2/arch/x86_64/kernel/aperture.c linux-2.6.12-rc4-mm2-m/arch/x86_64/kernel/aperture.c
--- linux-2.6.12-rc4-mm2/arch/x86_64/kernel/aperture.c 2005-05-07 01:20:31.000000000 -0400
+++ linux-2.6.12-rc4-mm2-m/arch/x86_64/kernel/aperture.c 2005-05-16 13:13:52.000000000 -0400
@@ -42,11 +42,7 @@ static struct resource aper_res = {
static u32 __init allocate_aperture(void)
{
-#ifdef CONFIG_DISCONTIGMEM
pg_data_t *nd0 = NODE_DATA(0);
-#else
- pg_data_t *nd0 = &contig_page_data;
-#endif
u32 aper_size;
void *p;
diff -urNp linux-2.6.12-rc4-mm2/arch/x86_64/kernel/setup.c linux-2.6.12-rc4-mm2-m/arch/x86_64/kernel/setup.c
--- linux-2.6.12-rc4-mm2/arch/x86_64/kernel/setup.c 2005-05-16 13:17:18.000000000 -0400
+++ linux-2.6.12-rc4-mm2-m/arch/x86_64/kernel/setup.c 2005-05-16 13:13:52.000000000 -0400
@@ -408,7 +408,7 @@ static void __init contig_initmem_init(v
if (bootmap == -1L)
panic("Cannot find bootmem map of size %ld\n",bootmap_size);
bootmap_size = init_bootmem(bootmap >> PAGE_SHIFT, end_pfn);
- e820_bootmem_free(&contig_page_data, 0, end_pfn << PAGE_SHIFT);
+ e820_bootmem_free(NODE_DATA(0), 0, end_pfn << PAGE_SHIFT);
reserve_bootmem(bootmap, bootmap_size);
}
#endif
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"aart@kvack.org"> aart@kvack.org </a>
next reply other threads:[~2005-05-18 15:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-18 15:23 Matt Tolentino [this message]
2005-05-18 16:23 ` Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200505181523.j4IFN7rs026902@snoqualmie.dp.intel.com \
--to=metolent@snoqualmie.dp.intel.com \
--cc=ak@muc.de \
--cc=akpm@osdl.org \
--cc=apw@shadowen.org \
--cc=haveblue@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox