rpms/kernel/F-8 linux-2.6-x86_64-revert-sparsemem-4g.patch, NONE, 1.1 config-x86_64-generic, 1.11, 1.12 kernel.spec, 1.247, 1.248

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8746

Modified Files:
	config-x86_64-generic kernel.spec 
Added Files:
	linux-2.6-x86_64-revert-sparsemem-4g.patch 
Log Message:
* Mon Oct 29 2007 Dave Jones <davej at redhat.com>
- Revert: x86_64: allocate sparsemem memmap above 4G (fixes bz #249174)
  (Much thanks to Martin Ebourne for tracking this down).


linux-2.6-x86_64-revert-sparsemem-4g.patch:

--- NEW FILE linux-2.6-x86_64-revert-sparsemem-4g.patch ---
Revert this commit:

commit 2e1c49db4c640b35df13889b86b9d62215ade4b6
Author: Zou Nan hai <nanhai.zou at 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 at intel.com>
    Acked-by: Suresh Siddha <suresh.b.siddha at intel.com>
    Cc: Andi Kleen <ak at suse.de>
    Cc: <stable at kernel.org>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at 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)


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/config-x86_64-generic,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- config-x86_64-generic	9 Oct 2007 18:10:25 -0000	1.11
+++ config-x86_64-generic	29 Oct 2007 17:38:22 -0000	1.12
@@ -125,8 +125,6 @@
 CONFIG_PNPACPI=y
 
 CONFIG_BLK_DEV_AMD74XX=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=y
 CONFIG_CRYPTO_AES_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- kernel.spec	29 Oct 2007 17:25:29 -0000	1.247
+++ kernel.spec	29 Oct 2007 17:38:22 -0000	1.248
@@ -584,6 +584,7 @@
 Patch70: linux-2.6-x86_64-silence-up-apic-errors.patch
 Patch75: linux-2.6-x86-debug-boot.patch
 Patch76: linux-2.6-x86-clean-up-oops-bug-reports.patch
+Patch77: linux-2.6-x86_64-revert-sparsemem-4g.patch
 
 Patch80: linux-2.6-alsa-1.0.15-merge-1.patch
 Patch81: linux-2.6-alsa-1.0.15-merge-2.patch
@@ -1054,7 +1055,8 @@
 #ApplyPatch linux-2.6-x86-debug-boot.patch
 # shorter i386 oops reports (scheduled for 2.6.24)
 ApplyPatch linux-2.6-x86-clean-up-oops-bug-reports.patch
-# fix e820 detection
+# revert: x86_64: allocate sparsemem memmap above 4G
+ApplyPatch linux-2.6-x86_64-revert-sparsemem-4g.patch
 
 #
 # PowerPC
@@ -1885,6 +1887,10 @@
 
 %changelog
 * Mon Oct 29 2007 Dave Jones <davej at redhat.com>
+- Revert: x86_64: allocate sparsemem memmap above 4G (fixes bz #249174)
+  (Much thanks to Martin Ebourne for tracking this down).
+
+* Mon Oct 29 2007 Dave Jones <davej at redhat.com>
 - Change CRYPTO_CRC32 to built-in for F8 (bz #208607)
 
 * Fri Oct 26 2007 John W. Linville <linville at redhat.com>