Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1176128ybn; Tue, 24 Sep 2019 16:10:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqy94xk3NYZGYyLu1AJ14aK++eVNqhCLOOADU/0fgpCTVJRdK9OI19tFq6+9VJLVZkekV+xX X-Received: by 2002:a1c:f602:: with SMTP id w2mr3143269wmc.145.1569366622922; Tue, 24 Sep 2019 16:10:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569366622; cv=none; d=google.com; s=arc-20160816; b=bXl44sL0Q8cm26GItORx3Ar4HTPN+xMQ0pM/elAQD8VVORjH71GopW+Eo00pUYpGur 3KAVZpKtBXMXxlMH9pKcDCxQl4IrL21SLvhRR+uihFa15dD1qumuRsWKdIlYeX9gXwZU qIbyY9XXuRLRgsW83VkU6HbslPEm2aWv7M1BtwqTlrEoIaeqCOqqfNs6mxCBac3X2v+s oXkvEq1WJmvuvXG/AcdfsJOrOAdR75wbeCijF44rrMTFhu1DWbzv+M50KmCi+UOfZ5Yj tZ58YyNrWx8JhgjCV8W+7N5VznwLD0GKyikoKC0Tk27WDEFmwiJnBA6g3GrJr32xCIhT qBFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=slCbUtfe+50oZzGua7b2sWQZi9HExq2fvFViSSMgeNg=; b=aw7n8b9M4LhW6pl+ZhtAltJZGMn4//nF3jn8yp3CibTJC9tqXrR3Um0V8hJzAoYhQZ +mnssPIIYsuc85sHObE6YNMy5FuVb/KRK6azK5V/rlLHMmBOPaamdtyyaAtNZIvJBCCp PEVp8STkcpF34HhgzrVWPB+64Fz0IJsJ6K9Xju9WhMMlwVjrh2gEs3WSUVior6Fo2h1S WOSbrk8I2f0DiQNUj6ZXY3BfL0xSO2ijxdmZVLeWMcmop0TN4pdEohVKFh5JxaIoTI/T 01bfxBAyfprL+60+u2l0AZkxYprluABODlCQ3+FaaA0eFLWb739i8WiLKouloXiQGtv/ 8sDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="HXps/TLC"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c52si2192580eda.132.2019.09.24.16.09.31; Tue, 24 Sep 2019 16:10:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="HXps/TLC"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406799AbfIVThH (ORCPT + 99 others); Sun, 22 Sep 2019 15:37:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:41744 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389692AbfIVSp4 (ORCPT ); Sun, 22 Sep 2019 14:45:56 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C0C17206C2; Sun, 22 Sep 2019 18:45:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177955; bh=sQXkXt8R38QkmXVe1OI/saT7LbNFH+7CrxACz0uYLK4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HXps/TLCkwZ8Dhj+QJUJCJTu/woYhd3hPfzhFl8NMDTm75gIILarzqB4cYTYlHohD zvvcIItfodRPOed4WquZTWcuL2YvuwqS23+JOzAquGeKHT1csflOrGob3hPHHMkxrJ 4p+YD8XPf6btd8fxJ2Bk6emk+kFXQLm1Uncavkdo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Luke Mujica , Alexander Shishkin , Ian Rogers , Jiri Olsa , Peter Zijlstra , Stephane Eranian , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL 5.3 060/203] perf tools: Fix paths in include statements Date: Sun, 22 Sep 2019 14:41:26 -0400 Message-Id: <20190922184350.30563-60-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Luke Mujica [ Upstream commit 2b75863b0845764529e01014a5c90664d8044cbe ] These paths point to the wrong location but still work because they get picked up by a -I flag that happens to direct to the correct file. Fix paths to lead to the actual file location without help from include flags. Signed-off-by: Luke Mujica Cc: Alexander Shishkin Cc: Ian Rogers Cc: Jiri Olsa Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/20190719202253.220261-1-lukemujica@google.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/arch/x86/util/kvm-stat.c | 4 ++-- tools/perf/arch/x86/util/tsc.c | 6 +++--- tools/perf/ui/helpline.c | 4 ++-- tools/perf/ui/util.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/perf/arch/x86/util/kvm-stat.c b/tools/perf/arch/x86/util/kvm-stat.c index 865a9762f22ef..3f84403c0983a 100644 --- a/tools/perf/arch/x86/util/kvm-stat.c +++ b/tools/perf/arch/x86/util/kvm-stat.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include -#include "../../util/kvm-stat.h" -#include "../../util/evsel.h" +#include "../../../util/kvm-stat.h" +#include "../../../util/evsel.h" #include #include #include diff --git a/tools/perf/arch/x86/util/tsc.c b/tools/perf/arch/x86/util/tsc.c index 950539f9a4f77..b1eb963b4a6e1 100644 --- a/tools/perf/arch/x86/util/tsc.c +++ b/tools/perf/arch/x86/util/tsc.c @@ -5,10 +5,10 @@ #include #include -#include "../../perf.h" +#include "../../../perf.h" #include -#include "../../util/debug.h" -#include "../../util/tsc.h" +#include "../../../util/debug.h" +#include "../../../util/tsc.h" int perf_read_tsc_conversion(const struct perf_event_mmap_page *pc, struct perf_tsc_conversion *tc) diff --git a/tools/perf/ui/helpline.c b/tools/perf/ui/helpline.c index b3c421429ed44..54bcd08df87e3 100644 --- a/tools/perf/ui/helpline.c +++ b/tools/perf/ui/helpline.c @@ -3,10 +3,10 @@ #include #include -#include "../debug.h" +#include "../util/debug.h" #include "helpline.h" #include "ui.h" -#include "../util.h" +#include "../util/util.h" char ui_helpline__current[512]; diff --git a/tools/perf/ui/util.c b/tools/perf/ui/util.c index 63bf06e80ab9d..9ed76e88a3e4c 100644 --- a/tools/perf/ui/util.c +++ b/tools/perf/ui/util.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "util.h" -#include "../debug.h" +#include "../util/debug.h" /* -- 2.20.1