rpms/kernel/devel linux-2.6-vm-debug.patch, 1.2, 1.3 kernel-2.6.spec, 1.2740, 1.2741

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30655

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-vm-debug.patch 
Log Message:
- Disable various debugging options.
- Reenable VM negative pagecount debugging.



linux-2.6-vm-debug.patch:
 rmap.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

Index: linux-2.6-vm-debug.patch
===================================================================
RCS file: linux-2.6-vm-debug.patch
diff -N linux-2.6-vm-debug.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-vm-debug.patch	4 Oct 2006 23:44:50 -0000	1.3
@@ -0,0 +1,19 @@
+--- linux-2.6.18.noarch/mm/rmap.c~	2006-10-04 19:43:08.000000000 -0400
++++ linux-2.6.18.noarch/mm/rmap.c	2006-10-04 19:43:24.000000000 -0400
+@@ -576,15 +576,13 @@ void page_add_file_rmap(struct page *pag
+ void page_remove_rmap(struct page *page)
+ {
+ 	if (atomic_add_negative(-1, &page->_mapcount)) {
+-#ifdef CONFIG_DEBUG_VM
+ 		if (unlikely(page_mapcount(page) < 0)) {
+ 			printk (KERN_EMERG "Eeek! page_mapcount(page) went negative! (%d)\n", page_mapcount(page));
+ 			printk (KERN_EMERG "  page->flags = %lx\n", page->flags);
+ 			printk (KERN_EMERG "  page->count = %x\n", page_count(page));
+ 			printk (KERN_EMERG "  page->mapping = %p\n", page->mapping);
++			BUG();
+ 		}
+-#endif
+-		BUG_ON(page_mapcount(page) < 0);
+ 		/*
+ 		 * It would be tidy to reset the PageAnon mapping here,
+ 		 * but that might overwrite a racing page_add_anon_rmap


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2740
retrieving revision 1.2741
diff -u -r1.2740 -r1.2741
--- kernel-2.6.spec	4 Oct 2006 22:51:43 -0000	1.2740
+++ kernel-2.6.spec	4 Oct 2006 23:44:50 -0000	1.2741
@@ -513,6 +513,7 @@
 Patch1910: linux-2.6-unexport-symbols.patch
 
 # VM bits.
+Patch2000: linux-2.6-vm-debug.patch
 Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
 Patch2002: linux-2.6-mm-tracking-dirty-pages.patch
 Patch2003: linux-2.6-vm-pagecnt.patch
@@ -976,7 +977,7 @@
 %patch1018 -p1
 %patch1019 -p1
 # Disable the 'quiet' boot switch for better bug reports.
-%patch1020 -p1
+#%patch1020 -p1
 %patch1021 -p1
 %patch1022 -p1
 %if %{includexen}
@@ -1146,6 +1147,8 @@
 #
 # VM related fixes.
 #
+# Reenable negative pagecount debugging even if CONFIG_DEBUG_VM is off.
+%patch2000 -p1
 # Silence GFP_ATOMIC failures.
 %patch2001 -p1
 # track dirty pages
@@ -1988,6 +1991,8 @@
 %changelog
 * Wed Oct  4 2006 Dave Jones <davej at redhat.com>
 - Disable secmark.
+- Disable various debugging options.
+- Reenable VM negative pagecount debugging.
 
 * Wed Oct  4 2006 Stephen C. Tweedie <sct at redhat.com>
 - Fix for oops on reboot of xen dom0 (bug 209315)