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

Commit 3fff4c42 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

printk: Remove ratelimit.h from kernel.h 



Decouple kernel.h from ratelimit.h: the global declaration of
printk's ratelimit_state is not needed, and it leads to messy
circular dependencies due to ratelimit.h's (new) adding of a
spinlock_types.h include.

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: David S. Miller <davem@davemloft.net>
LKML-Reference: <new-submission>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent edaac8e3

include/linux/kernel.h

+0 −2
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,7 +240,6 @@ 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 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

kernel/printk.c

+1 −0
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>

kernel/sysctl.c

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,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>
@@ -155,6 +156,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

lib/ratelimit.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 * This file is released under the GPLv2.

 */



#include <linux/kernel.h>

#include <linux/ratelimit.h>

#include <linux/jiffies.h>

#include <linux/module.h>