diff options
| author | Namhyung Kim <namhyung@gmail.com> | 2010-10-26 17:22:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 19:52:16 -0400 |
| commit | f5d87d851d76a390d0fab2f77bd1d563d69ee586 (patch) | |
| tree | 4056332405b630e3bd2663beb3dcbf16955095cd | |
| parent | 674dff6507d3f9b110219ea125cf5e1213c9acef (diff) | |
printk: declare printk_ratelimit_state in ratelimit.h
Adding declaration of printk_ratelimit_state in ratelimit.h removes
potential build breakage and following sparse warning:
kernel/printk.c:1426:1: warning: symbol 'printk_ratelimit_state' was not declared. Should it be static?
[akpm@linux-foundation.org: remove unneeded ifdef]
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/linux/ratelimit.h | 2 | ||||
| -rw-r--r-- | kernel/sysctl.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ratelimit.h b/include/linux/ratelimit.h index 8f69d09a41a5..03ff67b0cdf5 100644 --- a/include/linux/ratelimit.h +++ b/include/linux/ratelimit.h | |||
| @@ -36,6 +36,8 @@ static inline void ratelimit_state_init(struct ratelimit_state *rs, | |||
| 36 | rs->begin = 0; | 36 | rs->begin = 0; |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | extern struct ratelimit_state printk_ratelimit_state; | ||
| 40 | |||
| 39 | extern int ___ratelimit(struct ratelimit_state *rs, const char *func); | 41 | extern int ___ratelimit(struct ratelimit_state *rs, const char *func); |
| 40 | #define __ratelimit(state) ___ratelimit(state, __func__) | 42 | #define __ratelimit(state) ___ratelimit(state, __func__) |
| 41 | 43 | ||
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 694b140852c2..48d9d689498f 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -161,8 +161,6 @@ extern int no_unaligned_warning; | |||
| 161 | extern int unaligned_dump_stack; | 161 | extern int unaligned_dump_stack; |
| 162 | #endif | 162 | #endif |
| 163 | 163 | ||
| 164 | extern struct ratelimit_state printk_ratelimit_state; | ||
| 165 | |||
| 166 | #ifdef CONFIG_PROC_SYSCTL | 164 | #ifdef CONFIG_PROC_SYSCTL |
| 167 | static int proc_do_cad_pid(struct ctl_table *table, int write, | 165 | static int proc_do_cad_pid(struct ctl_table *table, int write, |
| 168 | void __user *buffer, size_t *lenp, loff_t *ppos); | 166 | void __user *buffer, size_t *lenp, loff_t *ppos); |
