diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 09:50:22 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 09:50:22 -0800 |
commit | d0b093a8b5ae34ee8be1f7e0dd197fe4788fa1d5 (patch) | |
tree | deaed4192d440b6afb7470b0c36e69d9d65dd119 /kernel/printk.c | |
parent | 3e72b810e30cdf4655279dd767eb798ac7a8fe5e (diff) | |
parent | 5c828713358cb9df8aa174371edcbbb62203a490 (diff) | |
download | kernel_goldelico_gta04-d0b093a8b5ae34ee8be1f7e0dd197fe4788fa1d5.zip kernel_goldelico_gta04-d0b093a8b5ae34ee8be1f7e0dd197fe4788fa1d5.tar.gz kernel_goldelico_gta04-d0b093a8b5ae34ee8be1f7e0dd197fe4788fa1d5.tar.bz2 |
Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
ratelimit: Make suppressed output messages more useful
printk: Remove ratelimit.h from kernel.h
ratelimit: Fix/allow use in atomic contexts
ratelimit: Use per ratelimit context locking
Diffstat (limited to 'kernel/printk.c')
-rw-r--r-- | kernel/printk.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index f38b07f..b5ac4d9 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -33,6 +33,7 @@ #include <linux/bootmem.h> #include <linux/syscalls.h> #include <linux/kexec.h> +#include <linux/ratelimit.h> #include <asm/uaccess.h> @@ -1376,11 +1377,11 @@ late_initcall(disable_boot_consoles); */ DEFINE_RATELIMIT_STATE(printk_ratelimit_state, 5 * HZ, 10); -int printk_ratelimit(void) +int __printk_ratelimit(const char *func) { - return __ratelimit(&printk_ratelimit_state); + return ___ratelimit(&printk_ratelimit_state, func); } -EXPORT_SYMBOL(printk_ratelimit); +EXPORT_SYMBOL(__printk_ratelimit); /** * printk_timed_ratelimit - caller-controlled printk ratelimiting |