Attachment 240991 Details for Bug 249174 – Patch to revert broken commit

[patch] Patch to revert broken commit

linux-2.6-sparsemem-bug.patch (text/plain), 2.73 KB, created by Martin Ebourne on 2007-10-28 20:54:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Ebourne

Created: 2007-10-28 20:54:13 UTC

Size: 2.73 KB

patch

obsolete

>Revert this commit:
>
>commit 2e1c49db4c640b35df13889b86b9d62215ade4b6
>Author: Zou Nan hai <nanhai.zou@intel.com>
>Date:   Fri Jun 1 00:46:28 2007 -0700
>
>    x86_64: allocate sparsemem memmap above 4G
>    
>    On systems with huge amount of physical memory, VFS cache and memory memmap
>    may eat all available system memory under 4G, then the system may fail to
>    allocate swiotlb bounce buffer.
>    
>    There was a fix for this issue in arch/x86_64/mm/numa.c, but that fix dose
>    not cover sparsemem model.
>    
>    This patch add fix to sparsemem model by first try to allocate memmap above
>    4G.
>    
>    Signed-off-by: Zou Nan hai <nanhai.zou@intel.com>
>    Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
>    Cc: Andi Kleen <ak@suse.de>
>    Cc: <stable@kernel.org>
>    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
>
>diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
>index 458893b..e2d6bad 100644
>--- a/arch/x86_64/mm/init.c
>+++ b/arch/x86_64/mm/init.c
>@@ -734,12 +734,6 @@ int in_gate_area_no_task(unsigned long addr)
> 	return (addr >= VSYSCALL_START) && (addr < VSYSCALL_END);
> }
> 
>-void * __init 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);
>-}
>-
> const char *arch_vma_name(struct vm_area_struct *vma)
> {
> 	if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
>diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
>index c83534e..0365ec9 100644
>--- a/include/linux/bootmem.h
>+++ b/include/linux/bootmem.h
>@@ -59,7 +59,6 @@ extern void *__alloc_bootmem_core(struct bootmem_data *bdata,
> 				  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
> extern void reserve_bootmem(unsigned long addr, unsigned long size);
>diff --git a/mm/sparse.c b/mm/sparse.c
>index 239f5a7..1facdff 100644
>--- a/mm/sparse.c
>+++ b/mm/sparse.c
>@@ -215,12 +215,6 @@ static int __meminit sparse_init_one_section(struct mem_section *ms,
> 	return 1;
> }
> 
>-__attribute__((weak)) __init
>-void *alloc_bootmem_high_node(pg_data_t *pgdat, unsigned long size)
>-{
>-	return NULL;
>-}
>-
> static struct page __init *sparse_early_mem_map_alloc(unsigned long pnum)
> {
> 	struct page *map;
>@@ -231,11 +225,6 @@ static struct page __init *sparse_early_mem_map_alloc(unsigned long pnum)
> 	if (map)
> 		return map;
> 
>-  	map = alloc_bootmem_high_node(NODE_DATA(nid),
>-                       sizeof(struct page) * PAGES_PER_SECTION);
>-	if (map)
>-		return map;
>-
> 	map = alloc_bootmem_node(NODE_DATA(nid),
> 			sizeof(struct page) * PAGES_PER_SECTION);
> 	if (map)

Actions: View | Diff

Attachments on bug 249174: 160089 | 160133 | 161126 | 161127 | 174641 | 211951 | 240991