Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0b093a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-printk-for-linus' of... 

Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ratelimit: Make suppressed output messages more useful
  printk: Remove ratelimit.h from kernel.h
  ratelimit: Fix/allow use in atomic contexts
  ratelimit: Use per ratelimit context locking
parents 3e72b810 5c828713

include/linux/kernel.h

+2 −3
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/bitops.h>

#include <linux/log2.h>

#include <linux/typecheck.h>

#include <linux/ratelimit.h>

#include <linux/dynamic_debug.h>

#include <asm/byteorder.h>

#include <asm/bug.h>
@@ -241,8 +240,8 @@ asmlinkage int vprintk(const char *fmt, va_list args) 
asmlinkage int printk(const char * fmt, ...)

	__attribute__ ((format (printf, 1, 2))) __cold;



extern struct ratelimit_state printk_ratelimit_state;

extern int printk_ratelimit(void);

extern int __printk_ratelimit(const char *func);

#define printk_ratelimit() __printk_ratelimit(__func__)

extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,

				   unsigned int interval_msec);

include/linux/net.h

+1 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ static const struct proto_ops name##_ops = { \ 


#ifdef CONFIG_SYSCTL

#include <linux/sysctl.h>

#include <linux/ratelimit.h>

extern struct ratelimit_state net_ratelimit_state;

#endif

include/linux/ratelimit.h

+22 −11
Original line number Diff line number Diff line 
#ifndef _LINUX_RATELIMIT_H

#define _LINUX_RATELIMIT_H



#include <linux/param.h>

#include <linux/spinlock_types.h>



#define DEFAULT_RATELIMIT_INTERVAL	(5 * HZ)

#define DEFAULT_RATELIMIT_BURST		10



struct ratelimit_state {

	spinlock_t	lock;		/* protect the state */



	int		interval;

	int		burst;

	int		printed;
@@ -13,8 +17,15 @@ struct ratelimit_state { 
	unsigned long	begin;

};



#define DEFINE_RATELIMIT_STATE(name, interval, burst)		\

		struct ratelimit_state name = {interval, burst,}

#define DEFINE_RATELIMIT_STATE(name, interval_init, burst_init)		\

									\

	struct ratelimit_state name = {					\

		.lock		= __SPIN_LOCK_UNLOCKED(name.lock),	\

		.interval	= interval_init,			\

		.burst		= burst_init,				\

	}



extern int ___ratelimit(struct ratelimit_state *rs, const char *func);

#define __ratelimit(state) ___ratelimit(state, __func__)



extern int __ratelimit(struct ratelimit_state *rs);

#endif
 
#endif /* _LINUX_RATELIMIT_H */

kernel/printk.c

+4 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/bootmem.h>

#include <linux/syscalls.h>

#include <linux/kexec.h>

#include <linux/ratelimit.h>



#include <asm/uaccess.h>
@@ -1376,11 +1377,11 @@ late_initcall(disable_boot_consoles); 
 */

DEFINE_RATELIMIT_STATE(printk_ratelimit_state, 5 * HZ, 10);



int printk_ratelimit(void)

int __printk_ratelimit(const char *func)

{

	return __ratelimit(&printk_ratelimit_state);

	return ___ratelimit(&printk_ratelimit_state, func);

}

EXPORT_SYMBOL(printk_ratelimit);

EXPORT_SYMBOL(__printk_ratelimit);



/**

 * printk_timed_ratelimit - caller-controlled printk ratelimiting

kernel/sysctl.c

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/sysrq.h>

#include <linux/highuid.h>

#include <linux/writeback.h>

#include <linux/ratelimit.h>

#include <linux/hugetlb.h>

#include <linux/initrd.h>

#include <linux/key.h>
@@ -158,6 +159,8 @@ extern int no_unaligned_warning; 
extern int unaligned_dump_stack;

#endif



extern struct ratelimit_state printk_ratelimit_state;



#ifdef CONFIG_RT_MUTEXES

extern int max_lock_depth;

#endif