From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754891AbcGVSDP (ORCPT ); Fri, 22 Jul 2016 14:03:15 -0400 Received: from mga04.intel.com ([192.55.52.120]:6051 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754820AbcGVSDM (ORCPT ); Fri, 22 Jul 2016 14:03:12 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,405,1464678000"; d="scan'208";a="1027280946" Subject: [PATCH 1/3] x86, tracing: fix x86 exceptions trace header To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, luto@kernel.org, Dave Hansen , dave.hansen@linux.intel.com, rostedt@goodmis.org, mingo@redhat.com From: Dave Hansen Date: Fri, 22 Jul 2016 11:03:11 -0700 References: <20160722180310.99F5BCFF@viggo.jf.intel.com> In-Reply-To: <20160722180310.99F5BCFF@viggo.jf.intel.com> Message-Id: <20160722180311.7488A4CA@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Hansen The various tracing headers pass some variables into the tracing code itself to indicate things like the name of the tracing directory where the tracepoints should be located in debugfs. The general pattern is to #undef them before redefining them. But, if all instances don't do this, and two different trace headers get included in the same file, you'll get macro redefinition compile errors. Fix up the x86 exception tracing code to properly #undef one of its macros. Note that this isn't a problem in practice until the next patch in this series is applied and adds a #include of the FPU tracing header. Signed-off-by: Dave Hansen Cc: Steven Rostedt Cc: Ingo Molnar --- b/arch/x86/include/asm/trace/exceptions.h | 1 + 1 file changed, 1 insertion(+) diff -puN arch/x86/include/asm/trace/exceptions.h~pkeys-899-fix-exceptions-trace-define arch/x86/include/asm/trace/exceptions.h --- a/arch/x86/include/asm/trace/exceptions.h~pkeys-899-fix-exceptions-trace-define 2016-07-22 10:52:32.543331471 -0700 +++ b/arch/x86/include/asm/trace/exceptions.h 2016-07-22 10:52:32.546331607 -0700 @@ -45,6 +45,7 @@ DEFINE_PAGE_FAULT_EVENT(page_fault_kerne #undef TRACE_INCLUDE_PATH #define TRACE_INCLUDE_PATH . +#undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE exceptions #endif /* _TRACE_PAGE_FAULT_H */ _