From patchwork Fri Feb 24 05:45:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 13150938 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E05AC678D5 for ; Fri, 24 Feb 2023 05:46:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229533AbjBXFqC (ORCPT ); Fri, 24 Feb 2023 00:46:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229446AbjBXFqB (ORCPT ); Fri, 24 Feb 2023 00:46:01 -0500 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29E1158B49 for ; Thu, 23 Feb 2023 21:46:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677217561; x=1708753561; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=J4ddzLR+psc4696uSLVSdXy/gmpvIlpCfH9vfaohT5U=; b=gJPSl+MacqI3uTIud6drgQB+MIZ+D05RAMDDD3NwKpT+pPadsaNgLt/2 9NsalVlA5x6CijK+Iod0PyhEi62ruOhzg5sbE6J7rWvTZjxwyezP0apBh oUi4H+xCkm/YlIjYXgD+Nl4alMpRuUFRCnBlouxtj0B3r6ZR/YxCWgHLf j1GmI7hp6DsfCdPxoqGAM/eU142Heih+tye+ChqaA5Cng061Q4Xyz8wwX uQFEdmpDmpyPCrZQ6w2r71Zu4O6MxFZMvZIiOdyPyl7oFA3FIG4WWIPGD kQnebaL/NOzOB3l1jtCOW4J/0xm+afTDypuwEI/G8yxiGmz21TDbkMZON g==; X-IronPort-AV: E=McAfee;i="6500,9779,10630"; a="398137018" X-IronPort-AV: E=Sophos;i="5.97,322,1669104000"; d="scan'208";a="398137018" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2023 21:46:00 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10630"; a="1001701697" X-IronPort-AV: E=Sophos;i="5.97,322,1669104000"; d="scan'208";a="1001701697" Received: from kwameopo-mobl1.amr.corp.intel.com (HELO vverma7-desk1.local) ([10.209.85.102]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2023 21:45:59 -0800 From: Vishal Verma Date: Thu, 23 Feb 2023 22:45:38 -0700 Subject: [PATCH ndctl 1/2] cxl/monitor: fix include paths for tracefs and traceevent MIME-Version: 1.0 Message-Id: <20230223-meson-build-fixes-v1-1-5fae3b606395@intel.com> References: <20230223-meson-build-fixes-v1-0-5fae3b606395@intel.com> In-Reply-To: <20230223-meson-build-fixes-v1-0-5fae3b606395@intel.com> To: linux-cxl@vger.kernel.org Cc: =?utf-8?q?Michal_Such=C3=A1nek?= , Dave Jiang , Dan Williams , Dan Williams , Vishal Verma , nvdimm@lists.linux.dev X-Mailer: b4 0.13-dev-ada30 X-Developer-Signature: v=1; a=openpgp-sha256; l=2196; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=J4ddzLR+psc4696uSLVSdXy/gmpvIlpCfH9vfaohT5U=; b=owGbwMvMwCXGf25diOft7jLG02pJDMk//MVt7mmtq5upI5NzTmrbNtcyt/T6q3sjjPuLP4jU5 X0VsI3tKGVhEONikBVTZPm75yPjMbnt+TyBCY4wc1iZQIYwcHEKwERS+xj+ClyvOVl2SeXF68n8 4WfSbxxymtkhe9j6e+XXHQdeHXUN38HIcGqDkWpqkLO6fOAO46j42duXy/CalzhXL8nmq990dGY 7NwA= X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF Precedence: bulk List-ID: X-Mailing-List: linux-cxl@vger.kernel.org Distros vary on whether the above headers are placed in {prefix}/libtracefs/ or {prefix}/tracefs/, and likewise for traceevent. Since both of these libraries do ship with pkgconfig info to determine the exact include path, the respective #include statements can drop the {lib}trace{fs,event}/ prefix. Since the libraries are declared using meson's dependency() function, it already does the requisite pkgconfig parsing. Drop the above prefixes to allow the includes work on all distros. Link: https://github.com/pmem/ndctl/issues/234 Fixes: 8dedc6cf5e85 ("cxl: add a helper to parse trace events into a json object") Fixes: 7b237bc7a8ae ("cxl: add a helper to go through all current events and parse them") Reported-by: Michal Suchánek Cc: Dave Jiang Cc: Dan Williams Signed-off-by: Vishal Verma Reviewed-by: Ira Weiny Reviewed-by: Dave Jiang --- cxl/event_trace.c | 4 ++-- cxl/monitor.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cxl/event_trace.c b/cxl/event_trace.c index 76dd4e7..926f446 100644 --- a/cxl/event_trace.c +++ b/cxl/event_trace.c @@ -2,14 +2,14 @@ // Copyright (C) 2022, Intel Corp. All rights reserved. #include #include +#include #include #include #include #include #include #include -#include -#include +#include #include "event_trace.h" #define _GNU_SOURCE diff --git a/cxl/monitor.c b/cxl/monitor.c index 749f472..e3469b9 100644 --- a/cxl/monitor.c +++ b/cxl/monitor.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -16,8 +17,7 @@ #include #include #include -#include -#include +#include #include /* reuse the core log helpers for the monitor logger */