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/sysctl.c | |
| parent | 3e72b810e30cdf4655279dd767eb798ac7a8fe5e (diff) | |
| parent | 5c828713358cb9df8aa174371edcbbb62203a490 (diff) | |
| download | linux-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/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 0d949c517412..4dbf93a52ee9 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -36,6 +36,7 @@ #include <linux/sysrq.h> #include <linux/highuid.h> #include <linux/writeback.h> +#include <linux/ratelimit.h> #include <linux/hugetlb.h> #include <linux/initrd.h> #include <linux/key.h> @@ -158,6 +159,8 @@ extern int no_unaligned_warning; extern int unaligned_dump_stack; #endif +extern struct ratelimit_state printk_ratelimit_state; + #ifdef CONFIG_RT_MUTEXES extern int max_lock_depth; #endif |