[tip:perf/urgent] tracing: remove duplicate null-pointer check in skb tracepoint

tip-bot for Mathieu Desnoyers
2011-01-09T21:11:23Z

Commit-ID: 881fe4bdcdc899674524e30a76c76d298b447008
Gitweb: http://git.kernel.org/tip/881fe4bdcdc899674524e30a76c76d298b447008
Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
AuthorDate: Thu, 6 Jan 2011 12:53:19 -0500
Committer: Steven Rostedt <rostedt@goodmis.org>
CommitDate: Fri, 7 Jan 2011 20:55:42 -0500

tracing: remove duplicate null-pointer check in skb tracepoint

The check for NULL skb in the kfree_skb trace event is a duplicate from the
check already done in its only caller, kfree_skb(). Remove this duplicate check.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
LKML-Reference: <20110106175319.GA30610@Krystal>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: David S. Miller <davem@davemloft.net>
CC: Steven Rostedt <rostedt@goodmis.org>
CC: Frederic Weisbecker <fweisbec@gmail.com>
CC: Ingo Molnar <mingo@elte.hu>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Zhaolei <zhaolei@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
include/trace/events/skb.h | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h
index 75ce9d5..f10293c 100644
--- a/include/trace/events/skb.h
+++ b/include/trace/events/skb.h
@@ -25,9 +25,7 @@ TRACE_EVENT(kfree_skb,

TP_fast_assign(
__entry->skbaddr = skb;
- if (skb) {
- __entry->protocol = ntohs(skb->protocol);
- }
+ __entry->protocol = ntohs(skb->protocol);
__entry->location = location;
),