diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /include/trace/events/skb.h | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
Diffstat (limited to 'include/trace/events/skb.h')
| -rw-r--r-- | include/trace/events/skb.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h index 1e8fabb57c06..e499863b9669 100644 --- a/include/trace/events/skb.h +++ b/include/trace/events/skb.h | |||
| @@ -1,12 +1,12 @@ | |||
| 1 | #undef TRACE_SYSTEM | ||
| 2 | #define TRACE_SYSTEM skb | ||
| 3 | |||
| 1 | #if !defined(_TRACE_SKB_H) || defined(TRACE_HEADER_MULTI_READ) | 4 | #if !defined(_TRACE_SKB_H) || defined(TRACE_HEADER_MULTI_READ) |
| 2 | #define _TRACE_SKB_H | 5 | #define _TRACE_SKB_H |
| 3 | 6 | ||
| 4 | #include <linux/skbuff.h> | 7 | #include <linux/skbuff.h> |
| 5 | #include <linux/tracepoint.h> | 8 | #include <linux/tracepoint.h> |
| 6 | 9 | ||
| 7 | #undef TRACE_SYSTEM | ||
| 8 | #define TRACE_SYSTEM skb | ||
| 9 | |||
| 10 | /* | 10 | /* |
| 11 | * Tracepoint for free an sk_buff: | 11 | * Tracepoint for free an sk_buff: |
| 12 | */ | 12 | */ |