Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1

[mv-sheeva.git] / kernel / printk.c

diff --git a/kernel/printk.c b/kernel/printk.c
index a7f7559c5f6cbc2a06413622a09dd3a0bc21782d..b51b1567bb5570dfc5b4a19bffd5af865d254e77 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -1309,14 +1309,14 @@ void tty_write_message(struct tty_struct *tty, char *msg)
 
 #if defined CONFIG_PRINTK
 
-DEFINE_RATELIMIT_STATE(printk_ratelimit_state, 5 * HZ, 10);
 /*
  * printk rate limiting, lifted from the networking subsystem.
  *
- * This enforces a rate limit: not more than one kernel message
- * every printk_ratelimit_jiffies to make a denial-of-service
- * attack impossible.
+ * This enforces a rate limit: not more than 10 kernel messages
+ * every 5s to make a denial-of-service attack impossible.
  */
+DEFINE_RATELIMIT_STATE(printk_ratelimit_state, 5 * HZ, 10);
+
 int printk_ratelimit(void)
 {
        return __ratelimit(&printk_ratelimit_state);