diff options
| author | Dave Jones <davej@redhat.com> | 2011-07-21 21:01:32 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2011-07-21 21:01:32 -0400 |
| commit | c0bd0780af08576e417d7527d0612771a020835a (patch) | |
| tree | 5a0805621d08ed67150de34c961e0be859edb130 | |
| parent | 441b0a7fe736b4febfb247dfdedb5934f4b2f6e7 (diff) | |
| download | kernel-c0bd0780af08576e417d7527d0612771a020835a.tar.gz kernel-c0bd0780af08576e417d7527d0612771a020835a.tar.xz kernel-c0bd0780af08576e417d7527d0612771a020835a.zip | |
rediff, remove unnecessary export, and add modules printing to bad_page()
| -rw-r--r-- | linux-2.6-debug-taint-vm.patch | 46 |
1 files changed, 16 insertions, 30 deletions
diff --git a/linux-2.6-debug-taint-vm.patch b/linux-2.6-debug-taint-vm.patch index ee367d45a..672509db2 100644 --- a/linux-2.6-debug-taint-vm.patch +++ b/linux-2.6-debug-taint-vm.patch @@ -1,31 +1,20 @@ -From b04c57d9dc889462951312be2ac81ff6c702e954 Mon Sep 17 00:00:00 2001 -From: Kyle McMartin <kyle@phobos.i.jkkm.org> -Date: Wed, 8 Jul 2009 13:05:09 -0400 -Subject: [PATCH 3/6] fedora: linux-2.6-debug-taint-vm.patch - ---- - kernel/panic.c | 4 +++- - mm/slab.c | 8 ++++---- - mm/slub.c | 2 +- - 4 files changed, 11 insertions(+), 8 deletions(-) - -diff --git a/kernel/panic.c b/kernel/panic.c -index 984b3ec..6d1c3be 100644 ---- a/kernel/panic.c -+++ b/kernel/panic.c -@@ -199,6 +199,7 @@ const char *print_tainted(void) +diff --git a/mm/page_alloc.c b/mm/page_alloc.c +index 4e8985a..70d0853 100644 +--- a/mm/page_alloc.c ++++ b/mm/page_alloc.c +@@ -318,6 +318,7 @@ static void bad_page(struct page *page) + current->comm, page_to_pfn(page)); + dump_page(page); - return buf; - } -+EXPORT_SYMBOL(print_tainted); - - int test_taint(unsigned flag) - { ++ print_modules(); + dump_stack(); + out: + /* Leave bad fields for debug, except PageBuddy could make trouble */ diff --git a/mm/slab.c b/mm/slab.c -index e74a16e..7bc287e 100644 +index d96e223..6f8905b 100644 --- a/mm/slab.c +++ b/mm/slab.c -@@ -1803,8 +1803,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp) +@@ -1886,8 +1886,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp) /* Print header */ if (lines == 0) { printk(KERN_ERR @@ -36,7 +25,7 @@ index e74a16e..7bc287e 100644 print_objinfo(cachep, objp, 0); } /* Hexdump the affected line */ -@@ -2902,8 +2902,8 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp) +@@ -2985,8 +2985,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 " @@ -48,10 +37,10 @@ index e74a16e..7bc287e 100644 i < sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t); i++) { diff --git a/mm/slub.c b/mm/slub.c -index 819f056..8eff0f4 100644 +index 35f351f..e7ccb39 100644 --- a/mm/slub.c +++ b/mm/slub.c -@@ -433,7 +433,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...) +@@ -472,7 +472,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...) va_end(args); printk(KERN_ERR "========================================" "=====================================\n"); @@ -60,6 +49,3 @@ index 819f056..8eff0f4 100644 printk(KERN_ERR "----------------------------------------" "-------------------------------------\n\n"); } --- -1.6.2.5 - |