Commit 7ef3d2fd authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

printk_ratelimit() functions should use CONFIG_PRINTK 



Makes an embedded image a bit smaller.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 36e78914

include/linux/kernel.h

+13 −5
Original line number Diff line number Diff line
@@ -180,6 +180,13 @@ asmlinkage int printk(const char * fmt, ...) 
extern int log_buf_get_len(void);

extern int log_buf_read(int idx);

extern int log_buf_copy(char *dest, int idx, int len);



extern int printk_ratelimit_jiffies;

extern int printk_ratelimit_burst;

extern int printk_ratelimit(void);

extern int __printk_ratelimit(int ratelimit_jiffies, int ratelimit_burst);

extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,

				   unsigned int interval_msec);

#else

static inline int vprintk(const char *s, va_list args)

	__attribute__ ((format (printf, 1, 0)));
@@ -190,6 +197,12 @@ static inline int __cold printk(const char *s, ...) { return 0; } 
static inline int log_buf_get_len(void) { return 0; }

static inline int log_buf_read(int idx) { return 0; }

static inline int log_buf_copy(char *dest, int idx, int len) { return 0; }

static inline int printk_ratelimit(void) { return 0; }

static inline int __printk_ratelimit(int ratelimit_jiffies, \

				     int ratelimit_burst) { return 0; }

static inline bool printk_timed_ratelimit(unsigned long *caller_jiffies, \

					  unsigned int interval_msec)	\

		{ return false; }

#endif



extern void __attribute__((format(printf, 1, 2)))
@@ -197,11 +210,6 @@ extern void __attribute__((format(printf, 1, 2))) 


unsigned long int_sqrt(unsigned long);



extern int printk_ratelimit(void);

extern int __printk_ratelimit(int ratelimit_jiffies, int ratelimit_burst);

extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,

				unsigned int interval_msec);



static inline void console_silent(void)

{

	console_loglevel = 0;

kernel/printk.c

+2 −0
Original line number Diff line number Diff line
@@ -1251,6 +1251,7 @@ void tty_write_message(struct tty_struct *tty, char *msg) 
	return;

}



#if defined CONFIG_PRINTK

/*

 * printk rate limiting, lifted from the networking subsystem.

 *
@@ -1320,3 +1321,4 @@ bool printk_timed_ratelimit(unsigned long *caller_jiffies, 
	return false;

}

EXPORT_SYMBOL(printk_timed_ratelimit);

#endif

kernel/sysctl.c

+10 −10
Original line number Diff line number Diff line
@@ -73,8 +73,6 @@ extern int suid_dumpable; 
extern char core_pattern[];

extern int pid_max;

extern int min_free_kbytes;

extern int printk_ratelimit_jiffies;

extern int printk_ratelimit_burst;

extern int pid_max_min, pid_max_max;

extern int sysctl_drop_caches;

extern int percpu_pagelist_fraction;
@@ -490,14 +488,6 @@ static struct ctl_table kern_table[] = { 
		.mode		= 0644,

		.proc_handler	= &proc_dointvec,

	},

	{

		.ctl_name	= KERN_PRINTK,

		.procname	= "printk",

		.data		= &console_loglevel,

		.maxlen		= 4*sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec,

	},

#ifdef CONFIG_KMOD

	{

		.ctl_name	= KERN_MODPROBE,
@@ -644,6 +634,15 @@ static struct ctl_table kern_table[] = { 
		.mode		= 0644,

		.proc_handler	= &proc_dointvec,

	},

#if defined CONFIG_PRINTK

	{

		.ctl_name	= KERN_PRINTK,

		.procname	= "printk",

		.data		= &console_loglevel,

		.maxlen		= 4*sizeof(int),

		.mode		= 0644,

		.proc_handler	= &proc_dointvec,

	},

	{

		.ctl_name	= KERN_PRINTK_RATELIMIT,

		.procname	= "printk_ratelimit",
@@ -661,6 +660,7 @@ static struct ctl_table kern_table[] = { 
		.mode		= 0644,

		.proc_handler	= &proc_dointvec,

	},

#endif

	{

		.ctl_name	= KERN_NGROUPS_MAX,

		.procname	= "ngroups_max",