rpms/kernel/F-11 kernel.spec, 1.1786, 1.1787 linux-2.6-debug-taint-vm.patch, 1.25, 1.26 linux-2.6-debug-spinlock-taint.patch, 1.11, NONE

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7493

Modified Files:
	kernel.spec linux-2.6-debug-taint-vm.patch 
Removed Files:
	linux-2.6-debug-spinlock-taint.patch 
Log Message:
Drop some of the vm/spinlock taint patches. dump_stack() already does same.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1786
retrieving revision 1.1787
diff -u -p -r1.1786 -r1.1787
--- kernel.spec	4 Jan 2010 15:25:46 -0000	1.1786
+++ kernel.spec	4 Jan 2010 21:44:25 -0000	1.1787
@@ -631,7 +631,6 @@ Patch160: linux-2.6-execshield.patch
 Patch250: linux-2.6-debug-sizeof-structs.patch
 Patch260: linux-2.6-debug-nmi-timeout.patch
 Patch270: linux-2.6-debug-taint-vm.patch
-Patch280: linux-2.6-debug-spinlock-taint.patch
 Patch300: linux-2.6-driver-level-usb-autosuspend.diff
 Patch303: linux-2.6-enable-btusb-autosuspend.patch
 Patch304: linux-2.6-usb-uvc-autosuspend.diff
@@ -1216,7 +1215,6 @@ ApplyPatch linux-2.6-acpi-video-dos.patc
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
 ApplyPatch linux-2.6-debug-nmi-timeout.patch
 ApplyPatch linux-2.6-debug-taint-vm.patch
-ApplyPatch linux-2.6-debug-spinlock-taint.patch
 ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch
 ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
 
@@ -1997,6 +1995,9 @@ fi
 # and build.
 
 %changelog
+* Mon Jan 04 2010 Dave Jones <davej at redhat.com>
+- Drop some of the vm/spinlock taint patches. dump_stack() already does same.
+
 * Fri Jan  1 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.2-1
 - Rebased F-11 to 2.6.32, still needs forward porting of patches.
 

linux-2.6-debug-taint-vm.patch:
 kernel/panic.c |    1 +
 mm/slab.c      |    8 ++++----
 mm/slub.c      |    3 +--
 3 files changed, 6 insertions(+), 6 deletions(-)

Index: linux-2.6-debug-taint-vm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6-debug-taint-vm.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- linux-2.6-debug-taint-vm.patch	4 Jan 2010 15:25:47 -0000	1.25
+++ linux-2.6-debug-taint-vm.patch	4 Jan 2010 21:44:25 -0000	1.26
@@ -5,7 +5,6 @@ Subject: [PATCH 3/6] fedora: linux-2.6-d
 
 ---
  kernel/panic.c  |    4 +++-
- mm/page_alloc.c |    5 +++--
  mm/slab.c       |    8 ++++----
  mm/slub.c       |    2 +-
  4 files changed, 11 insertions(+), 8 deletions(-)
@@ -22,33 +21,6 @@ index 984b3ec..6d1c3be 100644
  
  int test_taint(unsigned flag)
  {
-@@ -350,7 +351,8 @@ static void warn_slowpath_common(const char *file, int line, void *caller, struc
- 	const char *board;
- 
- 	printk(KERN_WARNING "------------[ cut here ]------------\n");
--	printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
-+	printk(KERN_WARNING "WARNING: at %s:%d %pS() (%s)\n",
-+		file, line, caller, print_tainted());
- 	board = dmi_get_system_info(DMI_PRODUCT_NAME);
- 	if (board)
- 		printk(KERN_WARNING "Hardware name: %s\n", board);
-diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index e0f2cdf..21dcbc4 100644
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -257,9 +257,10 @@ static void bad_page(struct page *page)
- 	printk(KERN_ALERT "BUG: Bad page state in process %s  pfn:%05lx\n",
- 		current->comm, page_to_pfn(page));
- 	printk(KERN_ALERT
--		"page:%p flags:%p count:%d mapcount:%d mapping:%p index:%lx\n",
-+		"page:%p flags:%p count:%d mapcount:%d mapping:%p ",
- 		page, (void *)page->flags, page_count(page),
--		page_mapcount(page), page->mapping, page->index);
-+		page_mapcount(page), page->mapping);
-+	printk(KERN_CONT "index:%lx (%s)\n", page->index, print_tainted());
- 
- 	dump_stack();
- out:
 diff --git a/mm/slab.c b/mm/slab.c
 index e74a16e..7bc287e 100644
 --- a/mm/slab.c


--- linux-2.6-debug-spinlock-taint.patch DELETED ---