diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-06-15 03:02:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-15 03:02:23 -0700 |
| commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
| tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /net/core | |
| parent | pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next (diff) | |
| download | linux-dev-9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb.tar.xz linux-dev-9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 2 | ||||
| -rw-r--r-- | net/core/drop_monitor.c | 4 | ||||
| -rw-r--r-- | net/core/net-traces.c | 7 | ||||
| -rw-r--r-- | net/core/netpoll.c | 2 | ||||
| -rw-r--r-- | net/core/skbuff.c | 2 |
5 files changed, 8 insertions, 9 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index ea00e36f48e1..576a61574a93 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -126,7 +126,7 @@ #include <linux/in.h> #include <linux/jhash.h> #include <linux/random.h> -#include <trace/napi.h> +#include <trace/events/napi.h> #include "net-sysfs.h" diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c index a6c2ac2828fb..9d66fa953ab7 100644 --- a/net/core/drop_monitor.c +++ b/net/core/drop_monitor.c @@ -24,8 +24,8 @@ #include <net/genetlink.h> #include <net/netevent.h> -#include <trace/skb.h> -#include <trace/napi.h> +#include <trace/events/skb.h> +#include <trace/events/napi.h> #include <asm/unaligned.h> diff --git a/net/core/net-traces.c b/net/core/net-traces.c index b07b25bd2cde..f1e982c508bb 100644 --- a/net/core/net-traces.c +++ b/net/core/net-traces.c @@ -19,15 +19,14 @@ #include <linux/workqueue.h> #include <linux/netlink.h> #include <linux/net_dropmon.h> -#include <trace/skb.h> -#include <trace/napi.h> #include <asm/unaligned.h> #include <asm/bitops.h> +#define CREATE_TRACE_POINTS +#include <trace/events/skb.h> +#include <trace/events/napi.h> -DEFINE_TRACE(kfree_skb); EXPORT_TRACEPOINT_SYMBOL_GPL(kfree_skb); -DEFINE_TRACE(napi_poll); EXPORT_TRACEPOINT_SYMBOL_GPL(napi_poll); diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 7ab31a7576a1..9675f312830d 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -24,7 +24,7 @@ #include <net/tcp.h> #include <net/udp.h> #include <asm/unaligned.h> -#include <trace/napi.h> +#include <trace/events/napi.h> /* * We maintain a small pool of fully-sized skbs, to make sure the diff --git a/net/core/skbuff.c b/net/core/skbuff.c index b94d777e3eb4..1a94a3037370 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -65,7 +65,7 @@ #include <asm/uaccess.h> #include <asm/system.h> -#include <trace/skb.h> +#include <trace/events/skb.h> #include "kmap_skb.h" |