From 686b11c630c458c6cea285cf8eca7f6e0af1cfe1 Mon Sep 17 00:00:00 2001 From: James Puthukattukaran Date: Wed, 2 May 2007 19:27:13 +0200 Subject: [PATCH] --- yaml --- r: 53847 b: refs/heads/master c: 82d1bb725e128c97b362a4b33fcbfff08fdaaa5a h: refs/heads/master i: 53845: c8ddd3732d7923800de77e61af5c8863d40a79df 53843: d3b57eb8e33103b535f397f4f119f49838880c50 53839: 91023f6a24c7717b9ebe8a43cba8e82520a70745 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/aperture.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 59f4ff92712e..1a53c016ab87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c3d99c11c47c8a1a9ed6a46555dbf6520683c52 +refs/heads/master: 82d1bb725e128c97b362a4b33fcbfff08fdaaa5a diff --git a/trunk/arch/x86_64/kernel/aperture.c b/trunk/arch/x86_64/kernel/aperture.c index b487396c4c5b..a52af5820592 100644 --- a/trunk/arch/x86_64/kernel/aperture.c +++ b/trunk/arch/x86_64/kernel/aperture.c @@ -51,7 +51,6 @@ static void __init insert_aperture_resource(u32 aper_base, u32 aper_size) static u32 __init allocate_aperture(void) { - pg_data_t *nd0 = NODE_DATA(0); u32 aper_size; void *p; @@ -65,12 +64,12 @@ static u32 __init allocate_aperture(void) * Unfortunately we cannot move it up because that would make the * IOMMU useless. */ - p = __alloc_bootmem_node(nd0, aper_size, aper_size, 0); + p = __alloc_bootmem_nopanic(aper_size, aper_size, 0); if (!p || __pa(p)+aper_size > 0xffffffff) { printk("Cannot allocate aperture memory hole (%p,%uK)\n", p, aper_size>>10); if (p) - free_bootmem_node(nd0, __pa(p), aper_size); + free_bootmem(__pa(p), aper_size); return 0; } printk("Mapping aperture over %d KB of RAM @ %lx\n",