aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/kernel.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r--include/linux/kernel.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 5c4b1251e110..fdbbf72ca2eb 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -15,6 +15,7 @@
15#include <linux/bitops.h> 15#include <linux/bitops.h>
16#include <linux/log2.h> 16#include <linux/log2.h>
17#include <linux/typecheck.h> 17#include <linux/typecheck.h>
18#include <linux/ratelimit.h>
18#include <asm/byteorder.h> 19#include <asm/byteorder.h>
19#include <asm/bug.h> 20#include <asm/bug.h>
20 21
@@ -189,11 +190,8 @@ asmlinkage int vprintk(const char *fmt, va_list args)
189asmlinkage int printk(const char * fmt, ...) 190asmlinkage int printk(const char * fmt, ...)
190 __attribute__ ((format (printf, 1, 2))) __cold; 191 __attribute__ ((format (printf, 1, 2))) __cold;
191 192
192extern int printk_ratelimit_jiffies; 193extern struct ratelimit_state printk_ratelimit_state;
193extern int printk_ratelimit_burst;
194extern int printk_ratelimit(void); 194extern int printk_ratelimit(void);
195extern int __ratelimit(int ratelimit_jiffies, int ratelimit_burst);
196extern int __printk_ratelimit(int ratelimit_jiffies, int ratelimit_burst);
197extern bool printk_timed_ratelimit(unsigned long *caller_jiffies, 195extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
198 unsigned int interval_msec); 196 unsigned int interval_msec);
199#else 197#else
@@ -204,8 +202,6 @@ static inline int printk(const char *s, ...)
204 __attribute__ ((format (printf, 1, 2))); 202 __attribute__ ((format (printf, 1, 2)));
205static inline int __cold printk(const char *s, ...) { return 0; } 203static inline int __cold printk(const char *s, ...) { return 0; }
206static inline int printk_ratelimit(void) { return 0; } 204static inline int printk_ratelimit(void) { return 0; }
207static inline int __printk_ratelimit(int ratelimit_jiffies, \
208 int ratelimit_burst) { return 0; }
209static inline bool printk_timed_ratelimit(unsigned long *caller_jiffies, \ 205static inline bool printk_timed_ratelimit(unsigned long *caller_jiffies, \
210 unsigned int interval_msec) \ 206 unsigned int interval_msec) \
211 { return false; } 207 { return false; }