Skip to content

Commit

Permalink
[PATCH] x86-64: x86-64 system crashes when no memory populating Node 0
Browse files Browse the repository at this point in the history
I have a 4 socket AMD Operton system. The 2.6.18 kernel I have crashes
when there is no memory in node0.

AK: changed call to _nopanic

Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@suse.de>
  • Loading branch information
James Puthukattukaran authored and Andi Kleen committed May 2, 2007
1 parent 1c3d99c commit 82d1bb7
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions arch/x86_64/kernel/aperture.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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",
Expand Down

0 comments on commit 82d1bb7

Please sign in to comment.