From patchwork Tue May 14 14:58:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 243738 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id B8CB52C00B7 for ; Wed, 15 May 2013 00:58:44 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UcGgY-0000gX-T7; Tue, 14 May 2013 14:58:38 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UcGgG-0000dq-Eu for kernel-team@lists.ubuntu.com; Tue, 14 May 2013 14:58:20 +0000 Received: from cpc3-craw6-2-0-cust180.croy.cable.virginmedia.com ([77.100.248.181] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1UcGgG-0004sw-Af for kernel-team@lists.ubuntu.com; Tue, 14 May 2013 14:58:20 +0000 From: Colin King To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2][nexus4] UBUNTU: Revert "trace: Modify timer_start and irq_handler_entry trace events." Date: Tue, 14 May 2013 15:58:18 +0100 Message-Id: <1368543499-32647-2-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1368543499-32647-1-git-send-email-colin.king@canonical.com> References: <1368543499-32647-1-git-send-email-colin.king@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Colin Ian King Revert trace event changes that deviate from upstream kernel to ensure the lttng DKMS module builds without failure. This removes some extra tracing information that we don't require and ensures that the tracing matches the upstream kernel. This reverts commit a2cd6eaf5deaa40098eb6b692797519bc173381e. --- include/trace/events/irq.h | 5 +---- include/trace/events/timer.h | 11 ++++------- kernel/timer.c | 3 +-- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h index 0296174..1c09820 100644 --- a/include/trace/events/irq.h +++ b/include/trace/events/irq.h @@ -43,17 +43,14 @@ TRACE_EVENT(irq_handler_entry, TP_STRUCT__entry( __field( int, irq ) __string( name, action->name ) - __field(void*, handler) ), TP_fast_assign( __entry->irq = irq; __assign_str(name, action->name); - __entry->handler = action->handler; ), - TP_printk("irq=%d name=%s handler=%pf", - __entry->irq, __get_str(name), __entry->handler) + TP_printk("irq=%d name=%s", __entry->irq, __get_str(name)) ); /** diff --git a/include/trace/events/timer.h b/include/trace/events/timer.h index dd53c79..425bcfe 100644 --- a/include/trace/events/timer.h +++ b/include/trace/events/timer.h @@ -43,17 +43,15 @@ DEFINE_EVENT(timer_class, timer_init, */ TRACE_EVENT(timer_start, - TP_PROTO(struct timer_list *timer, - unsigned long expires, char deferrable), + TP_PROTO(struct timer_list *timer, unsigned long expires), - TP_ARGS(timer, expires, deferrable), + TP_ARGS(timer, expires), TP_STRUCT__entry( __field( void *, timer ) __field( void *, function ) __field( unsigned long, expires ) __field( unsigned long, now ) - __field(char, deferrable) ), TP_fast_assign( @@ -61,12 +59,11 @@ TRACE_EVENT(timer_start, __entry->function = timer->function; __entry->expires = expires; __entry->now = jiffies; - __entry->deferrable = deferrable; ), - TP_printk("timer=%p function=%pf expires=%lu [timeout=%ld] defer=%c", + TP_printk("timer=%p function=%pf expires=%lu [timeout=%ld]", __entry->timer, __entry->function, __entry->expires, - (long)__entry->expires - __entry->now, __entry->deferrable) + (long)__entry->expires - __entry->now) ); /** diff --git a/kernel/timer.c b/kernel/timer.c index 24c5d20..a297ffc 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -584,8 +584,7 @@ static inline void debug_activate(struct timer_list *timer, unsigned long expires) { debug_timer_activate(timer); - trace_timer_start(timer, expires, - tbase_get_deferrable(timer->base) > 0 ? 'y' : 'n'); + trace_timer_start(timer, expires); } static inline void debug_deactivate(struct timer_list *timer)