rpms/kernel/devel kernel-2.6.spec, 1.1826.2.6, 1.1826.2.7 linux-2.6-vm-debug.patch, 1.1, 1.1.2.1

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
      Tag: private-fc5-test2-branch
	kernel-2.6.spec linux-2.6-vm-debug.patch 
Log Message:
Remove BUG() that triggers too easily for test2



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1826.2.6
retrieving revision 1.1826.2.7
diff -u -r1.1826.2.6 -r1.1826.2.7
--- kernel-2.6.spec	9 Jan 2006 13:47:35 -0000	1.1826.2.6
+++ kernel-2.6.spec	9 Jan 2006 15:41:31 -0000	1.1826.2.7
@@ -1411,6 +1411,10 @@
 %endif
 
 %changelog
+* Mon Jan  9 2006 Dave Jones <davej at redhat.com>
+- Remove vm debug patch that triggers too easily right now.
+  (Needs fixing properly post test2).
+
 * Mon Jan  9 2006 David Woodhouse <dwmw2 at redhat.com>
 - Fix some usblp problems, add ieee1284_id to sysfs
 - update bcm43xx driver to version tested in -HEAD

linux-2.6-vm-debug.patch:
 drivers/scsi/st.c |    1 +
 mm/rmap.c         |    7 +++++++
 2 files changed, 8 insertions(+)

Index: linux-2.6-vm-debug.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-vm-debug.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- linux-2.6-vm-debug.patch	6 Jan 2006 03:15:23 -0000	1.1
+++ linux-2.6-vm-debug.patch	9 Jan 2006 15:41:31 -0000	1.1.2.1
@@ -24,13 +24,4 @@
  		if (dirtied)
  			SetPageDirty(page);
  		/* FIXME: cache flush missing for rw==READ
---- linux-2.6.15/include/linux/mm.h~	2006-01-05 22:02:20.000000000 -0500
-+++ linux-2.6.15/include/linux/mm.h	2006-01-05 22:02:48.000000000 -0500
-@@ -299,6 +299,7 @@ struct page {
- #define put_page_testzero(p)				\
- 	({						\
- 		BUG_ON(page_count(p) == 0);		\
-+		BUG_ON(page_count(p) <= page_mapcount(p));	\
- 		atomic_add_negative(-1, &(p)->_count);	\
- 	})
- 
+