From patchwork Thu Aug 8 18:27:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Naveen N. Rao" X-Patchwork-Id: 2841334 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E7EAEBF546 for ; Thu, 8 Aug 2013 18:30:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B3CA62034E for ; Thu, 8 Aug 2013 18:30:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F6BD2034A for ; Thu, 8 Aug 2013 18:30:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966109Ab3HHS3z (ORCPT ); Thu, 8 Aug 2013 14:29:55 -0400 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:39688 "EHLO e23smtp07.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966108Ab3HHS3x (ORCPT ); Thu, 8 Aug 2013 14:29:53 -0400 Received: from /spool/local by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 9 Aug 2013 04:16:49 +1000 Received: from d23dlp03.au.ibm.com (202.81.31.214) by e23smtp07.au.ibm.com (202.81.31.204) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 9 Aug 2013 04:16:47 +1000 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [9.190.234.120]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 166163578050; Fri, 9 Aug 2013 04:29:49 +1000 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r78IE60165274070; Fri, 9 Aug 2013 04:14:06 +1000 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r78ITlqD012666; Fri, 9 Aug 2013 04:29:48 +1000 Received: from naverao1-tp.s81c.com ([9.77.203.77]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r78ITH8O012383; Fri, 9 Aug 2013 04:29:44 +1000 From: "Naveen N. Rao" To: tony.luck@intel.com, bp@alien8.de, bhelgaas@google.com, rostedt@goodmis.org, rjw@sisk.pl, lance.ortiz@hp.com, m.chehab@samsung.com Cc: linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, "Naveen N. Rao" Subject: [PATCH 1/3] mce: acpi/apei: trace: Include PCIe AER trace event conditionally Date: Thu, 8 Aug 2013 23:57:49 +0530 Message-Id: <1375986471-27113-2-git-send-email-naveen.n.rao@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1375986471-27113-1-git-send-email-naveen.n.rao@linux.vnet.ibm.com> References: <1375986471-27113-1-git-send-email-naveen.n.rao@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13080818-0260-0000-0000-000003710CE7 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since we'll be adding multiple trace events to ras.h, we need to protect each block appropriately so that they only get included in the right places. Update PCIe AER trace event for this purpose. Signed-off-by: Naveen N. Rao --- drivers/pci/pcie/aer/aerdrv_errprint.c | 1 + include/trace/events/ras.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pci/pcie/aer/aerdrv_errprint.c b/drivers/pci/pcie/aer/aerdrv_errprint.c index 2c7c9f5..4d06859 100644 --- a/drivers/pci/pcie/aer/aerdrv_errprint.c +++ b/drivers/pci/pcie/aer/aerdrv_errprint.c @@ -24,6 +24,7 @@ #include "aerdrv.h" #define CREATE_TRACE_POINTS +#define TRACE_EVENT_PCIE_AER #include #define AER_AGENT_RECEIVER 0 diff --git a/include/trace/events/ras.h b/include/trace/events/ras.h index 88b8783..4a66142 100644 --- a/include/trace/events/ras.h +++ b/include/trace/events/ras.h @@ -1,7 +1,7 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM ras -#if !defined(_TRACE_AER_H) || defined(TRACE_HEADER_MULTI_READ) +#if (!defined(_TRACE_AER_H) || defined(TRACE_HEADER_MULTI_READ)) && defined(TRACE_EVENT_PCIE_AER) #define _TRACE_AER_H #include