From patchwork Sat Jan 5 17:09:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 13819 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 7F1A623E2E for ; Sat, 5 Jan 2013 17:10:09 +0000 (UTC) Received: from mail-vb0-f50.google.com (mail-vb0-f50.google.com [209.85.212.50]) by fiordland.canonical.com (Postfix) with ESMTP id 0A372A196B3 for ; Sat, 5 Jan 2013 17:10:08 +0000 (UTC) Received: by mail-vb0-f50.google.com with SMTP id ft2so5962524vbb.37 for ; Sat, 05 Jan 2013 09:10:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-content-scanned:x-cbid:x-gm-message-state; bh=uDkjAefXnk2xu4YHKNvIFs6/vD74yRL/A0tFLbMSBlg=; b=HGSHmMnSS1MwVRU911+8oI/H5Tx8JkqBnlxq2wBAwREMN848M/p2yqHdu4V3wr0evY IoD14TdCYStpwD/GEDgD9LkUmoQ69u0aRIesHRlojKqyylTw7qQtQLc59VJCSz4VkWTK SDxGFle0efJhM98sufTg2NWMtyL6Q7TO9bIkuke3LKtv3l8E8rLs3Ze+dHWduwYl+gS0 DDJC0hNvdGP/o3w2On+y9fB4LezZz77zXLj7XHnZCBW6WxUKaslPFYmvQcD1s16J+GXG NlpKpPnmtHvsQA/bc88TEicTCFcbfFoJriW1Ha01FphaT3zvJMgH24JBHwG/WMEjhlXX ST5A== X-Received: by 10.52.18.207 with SMTP id y15mr68650741vdd.8.1357405808552; Sat, 05 Jan 2013 09:10:08 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp16338veb; Sat, 5 Jan 2013 09:10:08 -0800 (PST) X-Received: by 10.42.51.207 with SMTP id f15mr41638672icg.16.1357405805856; Sat, 05 Jan 2013 09:10:05 -0800 (PST) Received: from e35.co.us.ibm.com (e35.co.us.ibm.com. [32.97.110.153]) by mx.google.com with ESMTPS id g6si181969icx.86.2013.01.05.09.10.05 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 05 Jan 2013 09:10:05 -0800 (PST) Received-SPF: pass (google.com: domain of paulmck@linux.vnet.ibm.com designates 32.97.110.153 as permitted sender) client-ip=32.97.110.153; Authentication-Results: mx.google.com; spf=pass (google.com: domain of paulmck@linux.vnet.ibm.com designates 32.97.110.153 as permitted sender) smtp.mail=paulmck@linux.vnet.ibm.com Received: from /spool/local by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 5 Jan 2013 10:10:05 -0700 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e35.co.us.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sat, 5 Jan 2013 10:10:03 -0700 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 6639D19D804C for ; Sat, 5 Jan 2013 10:10:02 -0700 (MST) Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r05HA2Ki263012 for ; Sat, 5 Jan 2013 10:10:02 -0700 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r05H9v9B017786 for ; Sat, 5 Jan 2013 10:10:02 -0700 Received: from paulmck-ThinkPad-W500 ([9.80.23.97]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r05H9joD017216; Sat, 5 Jan 2013 10:09:51 -0700 Received: by paulmck-ThinkPad-W500 (Postfix, from userid 1000) id 585CFE4768; Sat, 5 Jan 2013 09:09:40 -0800 (PST) From: "Paul E. McKenney" To: linux-kernel@vger.kernel.org Cc: mingo@elte.hu, laijs@cn.fujitsu.com, dipankar@in.ibm.com, akpm@linux-foundation.org, mathieu.desnoyers@polymtl.ca, josh@joshtriplett.org, niv@us.ibm.com, tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org, Valdis.Kletnieks@vt.edu, dhowells@redhat.com, edumazet@google.com, darren@dvhart.com, fweisbec@gmail.com, sbw@mit.edu, patches@linaro.org, "Paul E. McKenney" Subject: [PATCH tip/core/rcu 1/6] rcu: Fix blimit type for trace_rcu_batch_start() Date: Sat, 5 Jan 2013 09:09:33 -0800 Message-Id: <1357405778-13903-1-git-send-email-paulmck@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.8 In-Reply-To: <20130105170920.GA13766@linux.vnet.ibm.com> References: <20130105170920.GA13766@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13010517-4834-0000-0000-0000023FA426 X-Gm-Message-State: ALoCoQmL2p104qsxGDuHniuBekl+IQO5e6NXa9cink96AxKXWiULvi5Sfrym+IY0vLzATtAqi+NM From: "Paul E. McKenney" When the type of global variable blimit changed from int to long, the type of the blimit argument of trace_rcu_batch_start() needed to have changed. This commit fixes this issue. Signed-off-by: Paul E. McKenney --- include/trace/events/rcu.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/trace/events/rcu.h b/include/trace/events/rcu.h index d4f559b..f919498 100644 --- a/include/trace/events/rcu.h +++ b/include/trace/events/rcu.h @@ -393,7 +393,7 @@ TRACE_EVENT(rcu_kfree_callback, */ TRACE_EVENT(rcu_batch_start, - TP_PROTO(char *rcuname, long qlen_lazy, long qlen, int blimit), + TP_PROTO(char *rcuname, long qlen_lazy, long qlen, long blimit), TP_ARGS(rcuname, qlen_lazy, qlen, blimit), @@ -401,7 +401,7 @@ TRACE_EVENT(rcu_batch_start, __field(char *, rcuname) __field(long, qlen_lazy) __field(long, qlen) - __field(int, blimit) + __field(long, blimit) ), TP_fast_assign( @@ -411,7 +411,7 @@ TRACE_EVENT(rcu_batch_start, __entry->blimit = blimit; ), - TP_printk("%s CBs=%ld/%ld bl=%d", + TP_printk("%s CBs=%ld/%ld bl=%ld", __entry->rcuname, __entry->qlen_lazy, __entry->qlen, __entry->blimit) );