Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82d1bb72 authored by James Puthukattukaran's avatar James Puthukattukaran Committed by Andi Kleen
Browse files

[PATCH] x86-64: x86-64 system crashes when no memory populating Node 0 



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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 1c3d99c1

arch/x86_64/kernel/aperture.c

+2 −3
Original line number Diff line number Diff line
@@ -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",