summaryrefslogtreecommitdiff
path: root/net/core
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-05 20:50:22 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-05 20:50:22 +0300
commitd0b093a8b5ae34ee8be1f7e0dd197fe4788fa1d5 (patch)
treedeaed4192d440b6afb7470b0c36e69d9d65dd119 /net/core
parent3e72b810e30cdf4655279dd767eb798ac7a8fe5e (diff)
parent5c828713358cb9df8aa174371edcbbb62203a490 (diff)
downloadlinux-d0b093a8b5ae34ee8be1f7e0dd197fe4788fa1d5.tar.xz
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
Diffstat (limited to 'net/core')
-rw-r--r--net/core/sysctl_net_core.c2
-rw-r--r--net/core/utils.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 7db1de0497c6..887c03c4e3c6 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -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>
diff --git a/net/core/utils.c b/net/core/utils.c
index 83221aee7084..838250241d26 100644
--- a/net/core/utils.c
+++ b/net/core/utils.c
@@ -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>