rpms/kernel/FC-6 linux-2.6-x86_64-revert-sparsemem-4g.patch, NONE, 1.1 patch-2.6.22.11-rc1.bz2.sign, NONE, 1.1 .cvsignore, 1.575, 1.576 kernel-2.6.spec, 1.3033, 1.3034 sources, 1.539, 1.540 upstream, 1.459, 1.460 linux-2.6-snapshot-2.6.22.11.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Oct 31 23:41:00 UTC 2007
Author: cebbert
Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv8283
Modified Files:
.cvsignore kernel-2.6.spec sources upstream
Added Files:
linux-2.6-x86_64-revert-sparsemem-4g.patch
patch-2.6.22.11-rc1.bz2.sign
Removed Files:
linux-2.6-snapshot-2.6.22.11.patch
Log Message:
* Tue Oct 23 2007 Chuck Ebbert <cebbert at redhat.com>
- 2.6.22.11-rc1
- fix crash with AGP on some x86_64 systems
linux-2.6-x86_64-revert-sparsemem-4g.patch:
arch/x86_64/mm/init.c | 5 -----
include/linux/bootmem.h | 1 -
mm/sparse.c | 11 -----------
3 files changed, 17 deletions(-)
--- NEW FILE linux-2.6-x86_64-revert-sparsemem-4g.patch ---
Reverted upstream by:
Commit: 6a22c57b8d2a62dea7280a6b2ac807a539ef0716
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,8 +734,3 @@ int in_gate_area_no_task(unsigned long addr)
return (addr >= VSYSCALL_START) && (addr < VSYSCALL_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);
-}
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))
-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)
--- NEW FILE patch-2.6.22.11-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBHKJ1kyGugalF9Dw4RAsC5AKCBFC//v/n6TURbBpdU4ucdbMJmZwCfV1dL
jO94/mii4ctHR18gMD4aLik=
=wb1c
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/.cvsignore,v
retrieving revision 1.575
retrieving revision 1.576
diff -u -r1.575 -r1.576
--- .cvsignore 16 Oct 2007 18:13:44 -0000 1.575
+++ .cvsignore 31 Oct 2007 23:40:57 -0000 1.576
@@ -4,3 +4,4 @@
kernel-2.6.22
linux-2.6.22.tar.bz2
patch-2.6.22.10.bz2
+patch-2.6.22.11-rc1.bz2
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/kernel-2.6.spec,v
retrieving revision 1.3033
retrieving revision 1.3034
diff -u -r1.3033 -r1.3034
--- kernel-2.6.spec 23 Oct 2007 19:52:06 -0000 1.3033
+++ kernel-2.6.spec 31 Oct 2007 23:40:57 -0000 1.3034
@@ -497,7 +497,7 @@
%endif
# unreleased stable patch
-Patch02: linux-2.6-snapshot-2.6.22.11.patch
+Patch02: patch-2.6.22.11-rc1.bz2
%if !%{nopatches}
@@ -579,6 +579,7 @@
Patch601: linux-2.6-input-ff-create-limit-memory.patch
Patch602: linux-2.6-x86_64-e820_hole_size.patch
Patch603: linux-2.6-x86_64-fix-boot-speed-on-vt.patch
+Patch604: linux-2.6-x86_64-revert-sparsemem-4g.patch
Patch610: linux-2.6-defaults-fat-utf8.patch
Patch620: linux-2.6-defaults-unicode-vt.patch
@@ -1070,7 +1071,7 @@
%endif
# unreleased stable patch
-ApplyPatch linux-2.6-snapshot-2.6.22.11.patch
+ApplyPatch patch-2.6.22.11-rc1.bz2
# This patch adds a "make nonint_oldconfig" which is non-interactive and
# also gives a list of missing options at the end. Useful for automated
@@ -1256,6 +1257,8 @@
ApplyPatch linux-2.6-x86_64-e820_hole_size.patch
# fix boot speed on VT enabled processors
ApplyPatch linux-2.6-x86_64-fix-boot-speed-on-vt.patch
+# fix agp crash
+ApplyPatch linux-2.6-x86_64-revert-sparsemem-4g.patch
# Changes to upstream defaults.
# Use UTF-8 by default on VFAT.
@@ -2285,6 +2288,10 @@
%changelog
* Tue Oct 23 2007 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.22.11-rc1
+- fix crash with AGP on some x86_64 systems
+
+* Tue Oct 23 2007 Chuck Ebbert <cebbert at redhat.com>
- add patches queued for 2.6.22.11
* Mon Oct 22 2007 Chuck Ebbert <cebbert at redhat.com>
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/sources,v
retrieving revision 1.539
retrieving revision 1.540
diff -u -r1.539 -r1.540
--- sources 16 Oct 2007 18:13:44 -0000 1.539
+++ sources 31 Oct 2007 23:40:57 -0000 1.540
@@ -1,2 +1,3 @@
2e230d005c002fb3d38a3ca07c0200d0 linux-2.6.22.tar.bz2
8dc6d14fb270d13e8ef670d23387b418 patch-2.6.22.10.bz2
+74f24203db68ebe8ba262a3743492d73 patch-2.6.22.11-rc1.bz2
Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/upstream,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -r1.459 -r1.460
--- upstream 16 Oct 2007 18:13:44 -0000 1.459
+++ upstream 31 Oct 2007 23:40:57 -0000 1.460
@@ -1,2 +1,3 @@
linux-2.6.22.tar.bz2
patch-2.6.22.10.bz2
+patch-2.6.22.11-rc1.bz2
--- linux-2.6-snapshot-2.6.22.11.patch DELETED ---
More information about the fedora-cvs-commits
mailing list