Eric Lee / smarc-fsl-linux-kernel | Embedian Git Server

645dae969 tracing, net: fix net tree and tracing tree merge interaction ... Browse Code »

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

In file included from net/core/skbuff.c:69:
include/trace/skb.h:4: error: expected ')' before '(' token
include/trace/skb.h:4: error: expected ')' before '(' token
[...]

Caused by commit 2939b0469d04ba9ac791aca9a81625d7eb50662b ("tracing:
replace TPwith TP_") from the tracing tree interacting with commit 4893d39e865b2897bf9fcd329697d37032d853a1 ("Network Drop Monitor: Add trace declaration for skb frees") from the net tree.

Acked-by: David S. Miller
Signed-off-by: Ingo Molnar

Stephen Rothwell
2009-04-02 06:50:30 +0800

skb.h 209 Bytes

edit raw blame history

1 2 3 4 5 6 7 8 9 10 11

#ifndef _TRACE_SKB_H_
#define _TRACE_SKB_H_

#include <linux/skbuff.h>
#include <linux/tracepoint.h>

DECLARE_TRACE(kfree_skb,
	TP_PROTO(struct sk_buff *skb, void *location),
	TP_ARGS(skb, location));

#endif