diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2006-04-30 15:56:58 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2006-04-30 15:56:58 +0000 |
| commit | d524385c7d0671891f78f3a780bdb1cef18bc929 (patch) | |
| tree | 8431b649ca05f8c041f61fb683bef4af0e950797 /sys-kernel | |
| parent | Add sparc keyword --- Bug #131792. Builds and "runs" fine. (diff) | |
| download | gentoo-2-d524385c7d0671891f78f3a780bdb1cef18bc929.tar.gz gentoo-2-d524385c7d0671891f78f3a780bdb1cef18bc929.tar.bz2 gentoo-2-d524385c7d0671891f78f3a780bdb1cef18bc929.zip | |
Fix #131607.
(Portage version: 2.1_pre9-r5)
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/gentoo-sources/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-kernel/gentoo-sources/files/gentoo-sources-2.4.81106.patch | 18 |
2 files changed, 13 insertions, 10 deletions
diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog index 6f25973d9d2c..8f3d10f0c033 100644 --- a/sys-kernel/gentoo-sources/ChangeLog +++ b/sys-kernel/gentoo-sources/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-kernel/gentoo-sources # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.272 2006/04/28 21:33:02 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.273 2006/04/30 15:56:58 plasmaroo Exp $ + + 30 Apr 2006; <plasmaroo@gentoo.org> files/gentoo-sources-2.4.81106.patch: + Fix #131607. 28 Apr 2006; Gustavo Zacarias <gustavoz@gentoo.org> gentoo-sources-2.6.16-r4.ebuild: diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.81106.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.81106.patch index 2cc0ab84ebb8..e58cc184ce4b 100644 --- a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.81106.patch +++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.81106.patch @@ -17,10 +17,10 @@ diff -Nru a/fs/ntfs/debug.c b/fs/ntfs/debug.c +#include <linux/sched.h> + +/* minimum time in jiffies between messages */ -+int printk_ratelimit_jiffies = 5*HZ; ++int ntfs_debug_printk_ratelimit_jiffies = 5*HZ; + +/* number of messages we send before ratelimiting */ -+int printk_ratelimit_burst = 10; ++int ntfs_debug_printk_ratelimit_burst = 10; + +/* + * printk rate limiting, lifted from the networking subsystem. @@ -29,7 +29,7 @@ diff -Nru a/fs/ntfs/debug.c b/fs/ntfs/debug.c + * every printk_ratelimit_jiffies to make a denial-of-service + * attack impossible. + */ -+int printk_ratelimit(void) ++int ntfs_debug_printk_ratelimit(void) +{ + static spinlock_t ratelimit_lock = SPIN_LOCK_UNLOCKED; + static unsigned long toks = 10*5*HZ; @@ -41,12 +41,12 @@ diff -Nru a/fs/ntfs/debug.c b/fs/ntfs/debug.c + spin_lock_irqsave(&ratelimit_lock, flags); + toks += now - last_msg; + last_msg = now; -+ if (toks > (printk_ratelimit_burst * printk_ratelimit_jiffies)) -+ toks = printk_ratelimit_burst * printk_ratelimit_jiffies; -+ if (toks >= printk_ratelimit_jiffies) { ++ if (toks > (ntfs_debug_printk_ratelimit_burst * ntfs_debug_printk_ratelimit_jiffies)) ++ toks = ntfs_debug_printk_ratelimit_burst * ntfs_debug_printk_ratelimit_jiffies; ++ if (toks >= ntfs_debug_printk_ratelimit_jiffies) { + int lost = missed; + missed = 0; -+ toks -= printk_ratelimit_jiffies; ++ toks -= ntfs_debug_printk_ratelimit_jiffies; + spin_unlock_irqrestore(&ratelimit_lock, flags); + if (lost) + printk(KERN_WARNING "printk: %d messages suppressed.\n", lost); @@ -64,7 +64,7 @@ diff -Nru a/fs/ntfs/debug.c b/fs/ntfs/debug.c int flen = 0; +#ifndef DEBUG -+ if (!printk_ratelimit()) ++ if (!ntfs_debug_printk_ratelimit()) + return; +#endif if (function) @@ -75,7 +75,7 @@ diff -Nru a/fs/ntfs/debug.c b/fs/ntfs/debug.c int flen = 0; +#ifndef DEBUG -+ if (!printk_ratelimit()) ++ if (!ntfs_debug_printk_ratelimit()) + return; +#endif if (function) |