diff --git a/[refs] b/[refs] index 9d9dfaae3f09..2c7339509c50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5d87d851d76a390d0fab2f77bd1d563d69ee586 +refs/heads/master: 77006a0a828249dd69341f960043ee41e7487aa0 diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h index e9b492b33032..77b04ed037df 100644 --- a/trunk/include/linux/kernel.h +++ b/trunk/include/linux/kernel.h @@ -277,6 +277,11 @@ asmlinkage int vprintk(const char *fmt, va_list args) asmlinkage int printk(const char * fmt, ...) __attribute__ ((format (printf, 1, 2))) __cold; +/* + * Please don't use printk_ratelimit(), because it shares ratelimiting state + * with all other unrelated printk_ratelimit() callsites. Instead use + * printk_ratelimited() or plain old __ratelimit(). + */ extern int __printk_ratelimit(const char *func); #define printk_ratelimit() __printk_ratelimit(__func__) extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,