diff --git a/[refs] b/[refs] index 2f6720dcec46..9d9dfaae3f09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 674dff6507d3f9b110219ea125cf5e1213c9acef +refs/heads/master: f5d87d851d76a390d0fab2f77bd1d563d69ee586 diff --git a/trunk/include/linux/ratelimit.h b/trunk/include/linux/ratelimit.h index 8f69d09a41a5..03ff67b0cdf5 100644 --- a/trunk/include/linux/ratelimit.h +++ b/trunk/include/linux/ratelimit.h @@ -36,6 +36,8 @@ static inline void ratelimit_state_init(struct ratelimit_state *rs, rs->begin = 0; } +extern struct ratelimit_state printk_ratelimit_state; + extern int ___ratelimit(struct ratelimit_state *rs, const char *func); #define __ratelimit(state) ___ratelimit(state, __func__) diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c index 694b140852c2..48d9d689498f 100644 --- a/trunk/kernel/sysctl.c +++ b/trunk/kernel/sysctl.c @@ -161,8 +161,6 @@ extern int no_unaligned_warning; extern int unaligned_dump_stack; #endif -extern struct ratelimit_state printk_ratelimit_state; - #ifdef CONFIG_PROC_SYSCTL static int proc_do_cad_pid(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos);