Skip to contentSkip to conversation

printk: Remove ratelimit.h from kernel.h

tip:core/printk tip-bot for Ingo Molnar 1 participant 1 message Sep 22, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw
Commit-ID:  3fff4c42bd0a89869a0eb1e7874cc06ffa4aa0f5
Gitweb:     http://git.kernel.org/tip/3fff4c42bd0a89869a0eb1e7874cc06ffa4aa0f5
Author:     Ingo Molnar <[email protected]>
AuthorDate: Tue, 22 Sep 2009 16:18:09 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 22 Sep 2009 16:18:09 +0200

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 <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: David S. Miller <[email protected]>
LKML-Reference: <new-submission>

---
 include/linux/kernel.h     |    2 --
 include/linux/net.h        |    1 +
 kernel/printk.c            |    1 +
 kernel/sysctl.c            |    3 +++
 lib/ratelimit.c            |    2 +-
 net/core/sysctl_net_core.c |    2 ++
 net/core/utils.c           |    2 ++
 7 files changed, 10 insertions(+), 3 deletions(-)
include/linux/kernel.h +0 -2
index 2b5b1e0..3305f33 100644
@@ -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
index 9040a10..df20f68 100644
@@ -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
index 602033a..b997c89 100644
@@ -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
index 1a631ba..6c37048 100644
@@ -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
index 69bfcac..5551731 100644
@@ -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>
 
net/core/sysctl_net_core.c +2 -0
index 7db1de0..887c03c 100644
@@ -10,7 +10,9 @@
 #include <linux/module.h>
 #include <linux/socket.h>
 #include <linux/netdevice.h>
+#include <linux/ratelimit.h>
 #include <linux/init.h>
+
 #include <net/ip.h>
 #include <net/sock.h>
 
net/core/utils.c +2 -0
index 83221ae..8382502 100644
@@ -24,6 +24,8 @@
 #include <linux/types.h>
 #include <linux/percpu.h>
 #include <linux/init.h>
+#include <linux/ratelimit.h>
+
 #include <net/sock.h>
 
 #include <asm/byteorder.h>