diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/printk.c | 7 | ||||
-rw-r--r-- | kernel/sysctl.c | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index f38b07f78a4e..b5ac4d99c667 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/bootmem.h> | 33 | #include <linux/bootmem.h> |
34 | #include <linux/syscalls.h> | 34 | #include <linux/syscalls.h> |
35 | #include <linux/kexec.h> | 35 | #include <linux/kexec.h> |
36 | #include <linux/ratelimit.h> | ||
36 | 37 | ||
37 | #include <asm/uaccess.h> | 38 | #include <asm/uaccess.h> |
38 | 39 | ||
@@ -1376,11 +1377,11 @@ late_initcall(disable_boot_consoles); | |||
1376 | */ | 1377 | */ |
1377 | DEFINE_RATELIMIT_STATE(printk_ratelimit_state, 5 * HZ, 10); | 1378 | DEFINE_RATELIMIT_STATE(printk_ratelimit_state, 5 * HZ, 10); |
1378 | 1379 | ||
1379 | int printk_ratelimit(void) | 1380 | int __printk_ratelimit(const char *func) |
1380 | { | 1381 | { |
1381 | return __ratelimit(&printk_ratelimit_state); | 1382 | return ___ratelimit(&printk_ratelimit_state, func); |
1382 | } | 1383 | } |
1383 | EXPORT_SYMBOL(printk_ratelimit); | 1384 | EXPORT_SYMBOL(__printk_ratelimit); |
1384 | 1385 | ||
1385 | /** | 1386 | /** |
1386 | * printk_timed_ratelimit - caller-controlled printk ratelimiting | 1387 | * printk_timed_ratelimit - caller-controlled printk ratelimiting |
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 @@ | |||
36 | #include <linux/sysrq.h> | 36 | #include <linux/sysrq.h> |
37 | #include <linux/highuid.h> | 37 | #include <linux/highuid.h> |
38 | #include <linux/writeback.h> | 38 | #include <linux/writeback.h> |
39 | #include <linux/ratelimit.h> | ||
39 | #include <linux/hugetlb.h> | 40 | #include <linux/hugetlb.h> |
40 | #include <linux/initrd.h> | 41 | #include <linux/initrd.h> |
41 | #include <linux/key.h> | 42 | #include <linux/key.h> |
@@ -158,6 +159,8 @@ extern int no_unaligned_warning; | |||
158 | extern int unaligned_dump_stack; | 159 | extern int unaligned_dump_stack; |
159 | #endif | 160 | #endif |
160 | 161 | ||
162 | extern struct ratelimit_state printk_ratelimit_state; | ||
163 | |||
161 | #ifdef CONFIG_RT_MUTEXES | 164 | #ifdef CONFIG_RT_MUTEXES |
162 | extern int max_lock_depth; | 165 | extern int max_lock_depth; |
163 | #endif | 166 | #endif |