From patchwork Sun Jan 22 21:56:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 137255 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 543D7B6FB7 for ; Mon, 23 Jan 2012 09:46:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752668Ab2AVWpF (ORCPT ); Sun, 22 Jan 2012 17:45:05 -0500 Received: from a.ns.miles-group.at ([95.130.255.143]:47841 "EHLO radon.swed.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752298Ab2AVWoP (ORCPT ); Sun, 22 Jan 2012 17:44:15 -0500 Received: (qmail 2919 invoked by uid 89); 22 Jan 2012 22:44:14 -0000 Received: by simscan 1.3.1 ppid: 2888, pid: 2916, t: 0.1247s scanners: attach: 1.3.1 clamav: 0.96.5/m:53 Received: from unknown (HELO localhost.localdomain) (richard@nod.at@212.62.202.73) by radon.swed.at with ESMTPA; 22 Jan 2012 22:44:14 -0000 From: Richard Weinberger To: netfilter-devel@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, eric.dumazet@gmail.com, jengelh@medozas.de, Richard Weinberger Subject: [PATCH 2/6] ring_buffer: Export for_each_buffer_cpu() Date: Sun, 22 Jan 2012 22:56:17 +0100 Message-Id: <1327269381-20748-3-git-send-email-richard@nod.at> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1327269381-20748-1-git-send-email-richard@nod.at> References: <1327269381-20748-1-git-send-email-richard@nod.at> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In order to make ring_buffer usable to other modules for_each_buffer_cpu() needs to be exported. Signed-off-by: Richard Weinberger Acked-by: Steven Rostedt --- include/linux/ring_buffer.h | 5 +++++ kernel/trace/ring_buffer.c | 7 +++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/linux/ring_buffer.h b/include/linux/ring_buffer.h index 67be037..5c1c29f 100644 --- a/include/linux/ring_buffer.h +++ b/include/linux/ring_buffer.h @@ -185,4 +185,9 @@ enum ring_buffer_flags { RB_FL_OVERWRITE = 1 << 0, }; +cpumask_var_t *ring_buffer_mask(struct ring_buffer *buffer); + +#define for_each_buffer_cpu(buffer, cpu) \ + for_each_cpu(cpu, *(ring_buffer_mask(buffer))) + #endif /* _LINUX_RING_BUFFER_H */ diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index f5b7b5c..a4117c5 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -348,6 +348,7 @@ void *ring_buffer_event_data(struct ring_buffer_event *event) } EXPORT_SYMBOL_GPL(ring_buffer_event_data); +#undef for_each_buffer_cpu #define for_each_buffer_cpu(buffer, cpu) \ for_each_cpu(cpu, buffer->cpumask) @@ -4139,3 +4140,9 @@ static int rb_cpu_notify(struct notifier_block *self, return NOTIFY_OK; } #endif + +cpumask_var_t *ring_buffer_mask(struct ring_buffer *buffer) +{ + return &buffer->cpumask; +} +EXPORT_SYMBOL_GPL(ring_buffer_mask);