Attachment 158909 Details for Bug 223433 – sparsemem memmap allocation above 4G

[patch] sparsemem memmap allocation above 4G

sparsemem-memmap-4.5.patch (text/plain), 2.31 KB, created by Geoff Gustafson on 2007-07-10 22:33:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Geoff Gustafson

Created: 2007-07-10 22:33:11 UTC

Size: 2.31 KB

patch

obsolete

>diff -Nruap -X /root/dontdiff linux-2.6.9.bak/arch/x86_64/mm/init.c linux-2.6.9/arch/x86_64/mm/init.c
>--- linux-2.6.9.bak/arch/x86_64/mm/init.c	2007-06-05 00:26:26.000000000 +0800
>+++ linux-2.6.9/arch/x86_64/mm/init.c	2007-06-05 00:56:24.000000000 +0800
>@@ -670,6 +670,12 @@ int in_gate_area(struct task_struct *tas
> 	return (addr >= vma->vm_start) && (addr < vma->vm_end);
> }
> 
>+void *alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size)
>+{
>+	return __alloc_bootmem_core(pgdat->bdata, size,
>+			SMP_CACHE_BYTES, (4UL*1024*1024*1024), 0);
>+}
>+
> #ifdef CONFIG_MEM_MIRROR
> /*
>  * For memory-tracking purposes, see mm_track.h for details.
>diff -Nruap -X /root/dontdiff linux-2.6.9.bak/include/linux/bootmem.h linux-2.6.9/include/linux/bootmem.h
>--- linux-2.6.9.bak/include/linux/bootmem.h	2007-06-05 00:26:25.000000000 +0800
>+++ linux-2.6.9/include/linux/bootmem.h	2007-06-05 00:46:08.000000000 +0800
>@@ -63,6 +63,7 @@ extern void __init free_bootmem_node (pg
> extern unsigned long __init free_all_bootmem_node (pg_data_t *pgdat);
> extern void * __init __alloc_bootmem_node (pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal);
> extern void * __init __alloc_bootmem_core (struct bootmem_data *bdata, unsigned long size, unsigned long align, unsigned long goal, unsigned long limit);
>+extern void *alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size);
> #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE
> #define alloc_bootmem_node(pgdat, x) \
> 	__alloc_bootmem_node((pgdat), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
>diff -Nruap -X /root/dontdiff linux-2.6.9.bak/mm/page_alloc.c linux-2.6.9/mm/page_alloc.c
>--- linux-2.6.9.bak/mm/page_alloc.c	2007-06-05 00:26:26.000000000 +0800
>+++ linux-2.6.9/mm/page_alloc.c	2007-06-05 01:00:08.000000000 +0800
>@@ -1609,12 +1609,20 @@ static void __init free_area_init_core(s
> 	}
> }
> 
>+__attribute__((weak))
>+void *alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size)
>+{
>+	return NULL;
>+}
>+
> void __init node_alloc_mem_map(struct pglist_data *pgdat)
> {
> 	unsigned long size;
> 
> 	size = (pgdat->node_spanned_pages + 1) * sizeof(struct page);
> 	if (!pgdat->node_mem_map)
>+		pgdat->node_mem_map = alloc_bootmem_high_node(pgdat, size);
>+	if (!pgdat->node_mem_map)
> 		pgdat->node_mem_map = alloc_bootmem_node(pgdat, size);
> #ifndef CONFIG_DISCONTIGMEM
> 	mem_map = contig_page_data.node_mem_map;

Actions: View | Diff

Attachments on bug 223433: 158909