rpms/kernel/devel linux-2.6-debug-taint-vm.patch,1.22,1.23

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19511

Modified Files:
	linux-2.6-debug-taint-vm.patch 
Log Message:
update debug-taint-vm patch

linux-2.6-debug-taint-vm.patch:

Index: linux-2.6-debug-taint-vm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-debug-taint-vm.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- linux-2.6-debug-taint-vm.patch	8 Dec 2008 16:27:32 -0000	1.22
+++ linux-2.6-debug-taint-vm.patch	15 Jan 2009 07:38:39 -0000	1.23
@@ -1,8 +1,8 @@
 diff --git a/kernel/panic.c b/kernel/panic.c
-index 4d50883..f4a6faa 100644
+index 2a2ff36..361d852 100644
 --- a/kernel/panic.c
 +++ b/kernel/panic.c
-@@ -193,6 +193,7 @@ const char *print_tainted(void)
+@@ -194,6 +194,7 @@ const char *print_tainted(void)
  		snprintf(buf, sizeof(buf), "Not tainted");
  	return(buf);
  }
@@ -10,7 +10,7 @@
  
  int test_taint(unsigned flag)
  {
-@@ -328,8 +329,8 @@ void warn_on_slowpath(const char *file, int line)
+@@ -334,8 +335,8 @@ void warn_slowpath(const char *file, int line, const char *fmt, ...)
  	sprint_symbol(function, caller);
  
  	printk(KERN_WARNING "------------[ cut here ]------------\n");
@@ -18,28 +18,28 @@
 -		line, function);
 +	printk(KERN_WARNING "WARNING: at %s:%d %s() (%s)\n", file,
 +		line, function, print_tainted());
- 	print_modules();
- 	dump_stack();
- 	print_oops_end_marker();
+ 	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 d8ac014..1d035f0 100644
+index 5675b30..ae3e7ff 100644
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -224,10 +224,10 @@ static inline int bad_range(struct zone *zone, struct page *page)
- static void bad_page(struct page *page)
- {
- 	printk(KERN_EMERG "Bad page state in process '%s'\n" KERN_EMERG
--		"page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n",
-+		"page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n",
- 		current->comm, page, (int)(2*sizeof(unsigned long)),
- 		(unsigned long)page->flags, page->mapping,
--		page_mapcount(page), page_count(page));
-+		page_mapcount(page), page_count(page), print_tainted());
+@@ -250,9 +250,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());
  
- 	printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n"
- 		KERN_EMERG "Backtrace:\n");
+ 	dump_stack();
+ out:
 diff --git a/mm/slab.c b/mm/slab.c
-index 0918751..0977a03 100644
+index ddc41f3..bf54397 100644
 --- a/mm/slab.c
 +++ b/mm/slab.c
 @@ -1858,8 +1858,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
@@ -53,7 +53,7 @@
  				print_objinfo(cachep, objp, 0);
  			}
  			/* Hexdump the affected line */
-@@ -2928,8 +2928,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
+@@ -2930,8 +2930,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
  	if (entries != cachep->num - slabp->inuse) {
  bad:
  		printk(KERN_ERR "slab: Internal list corruption detected in "
@@ -65,10 +65,10 @@
  		     i < sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t);
  		     i++) {
 diff --git a/mm/slub.c b/mm/slub.c
-index 749588a..0ef64f1 100644
+index 6392ae5..4f6acce 100644
 --- a/mm/slub.c
 +++ b/mm/slub.c
-@@ -430,7 +430,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
+@@ -435,7 +435,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
  	va_end(args);
  	printk(KERN_ERR "========================================"
  			"=====================================\n");