git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
net
/
core
/
net-traces.c
diff --git
a/net/core/net-traces.c
b/net/core/net-traces.c
index
499a67e
..
f1e982c
100644
(file)
--- a/
net/core/net-traces.c
+++ b/
net/core/net-traces.c
@@
-25,5
+25,8
@@
#define CREATE_TRACE_POINTS
#include <trace/events/skb.h>
+#include <trace/events/napi.h>
EXPORT_TRACEPOINT_SYMBOL_GPL(kfree_skb);
+
+EXPORT_TRACEPOINT_SYMBOL_GPL(napi_poll);