Merge branch 'f17' of ssh://pkgs.fedoraproject.org/kernel into f17
This commit is contained in:
commit
50263f8131
|
@ -642,6 +642,8 @@ Patch09: linux-2.6-upstream-reverts.patch
|
|||
# Standalone patches
|
||||
|
||||
Patch100: taint-vbox.patch
|
||||
Patch101: taint-rss.patch
|
||||
|
||||
Patch160: linux-2.6-32bit-mmap-exec-randomization.patch
|
||||
Patch161: linux-2.6-i386-nx-emulation.patch
|
||||
Patch162: nx-emu-remove-cpuinitdata-for-disable_nx-on-x86_32.patch
|
||||
|
@ -1323,6 +1325,7 @@ ApplyOptionalPatch linux-2.6-compile-fixes.patch
|
|||
ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
|
||||
|
||||
ApplyPatch taint-vbox.patch
|
||||
ApplyPatch taint-rss.patch
|
||||
|
||||
# Architecture patches
|
||||
# x86(-64)
|
||||
|
@ -2357,6 +2360,9 @@ fi
|
|||
# '-' | |
|
||||
# '-'
|
||||
%changelog
|
||||
* Mon Jun 18 2012 Dave Jones <davej@redhat.com>
|
||||
- Output taint info when the RSS counter check trips up.
|
||||
|
||||
* Mon Jun 18 2012 Justin M. Forbes <jforbes@redhat.com> 3.4.3-1
|
||||
- Linux 3.4.3
|
||||
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/kernel/fork.c b/kernel/fork.c
|
||||
index ab5211b..0aa3c51 100644
|
||||
--- a/kernel/fork.c
|
||||
+++ b/kernel/fork.c
|
||||
@@ -556,7 +556,7 @@ static void check_mm(struct mm_struct *mm)
|
||||
|
||||
if (unlikely(x))
|
||||
printk(KERN_ALERT "BUG: Bad rss-counter state "
|
||||
- "mm:%p idx:%d val:%ld\n", mm, i, x);
|
||||
+ "mm:%p idx:%d val:%ld (%s)\n", mm, i, x, print_tainted());
|
||||
}
|
||||
|
||||
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
|
Loading…
Reference in New Issue