Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1727264ybz; Sat, 18 Apr 2020 07:16:14 -0700 (PDT) X-Google-Smtp-Source: APiQypIQnGbxcQ6TaCgxfmG+gFBkQSN2EPZhitDiC7dU/YSRTfjh+WdNC1c+yGdRfbnBcW6wRC5B X-Received: by 2002:a17:906:6416:: with SMTP id d22mr7831503ejm.221.1587219374036; Sat, 18 Apr 2020 07:16:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587219374; cv=none; d=google.com; s=arc-20160816; b=Te7azVScOZcE5b8xntquS/xJ7j1+Jaj/rUY5+kPGp6TVpebStDL2WXm/CA/cjYqQKK V0hQ2bzQIq2gCdHaswNxTN6fWyhx/Tj9JA7JXV37RucJfvffF6ap9INYB2oaSIs9rhM7 Gs5BAORsw0zFCDS7NE6SShKe5I6HySr9dfhJU2bfNwMZ2xjKtOgc3SEhGIMG9n11jagL 5zFOgawGn4TZS3+VLnax+9KYfuNitKb/rXOQ+0DtIC58CTghKoBkIX3mEXnhxut70//a lGmYvlK6pFoyaQzXtAYQ9a9uCATfI3+KZa0jfWIe9xlNFLVhFLD8UTmjPJJf6cgyvNNM T7Lw== 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=PP+kqsgocjklB68By6qmkJYqKS6r8kEWLK0QoqPVlNA=; b=Xm4vSiaZqb5sknWPhXh25FyFVLkJREbUcACk0JuoVRlc4YOTNK8nA+7TnvvxK0W+ws aLWSY2h0XmkLgVEbJb5Ooxt0Jm/ObGScScAdLqTFI2Tha43mU8fnCXF0cX/aNIYiJeX6 J746wgrHTHvYMOpsyt4wM2jFqzJbjV2WcPDXsecLYDKaly0yefI92N+4FEEyJR4vsBYg 0IlzELKS8NYBYPELXkmIlOZGn2avvW4rQqeENSTmdmnTiQC1EcCvfulj+0RbqdEg+Gl1 TIIShWJNa1s94KTiVIKdCbp/QDC6P9JSlpi4erLMgXSVR7zx7hwPrvq0yBsvxKYgKIjY Kf7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=V2hSBbOB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id w10si15651918ejn.246.2020.04.18.07.15.51; Sat, 18 Apr 2020 07:16:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=V2hSBbOB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S1727977AbgDRONo (ORCPT + 99 others); Sat, 18 Apr 2020 10:13:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:37048 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726492AbgDROJe (ORCPT ); Sat, 18 Apr 2020 10:09:34 -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 047A622245; Sat, 18 Apr 2020 14:09:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587218973; bh=Xc3kVkDcDphF3/cM1fEX3LpTHlRX2wxUdtH4lsLODFk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V2hSBbOBoCKGAQxVnPLwDyPPjJISxRP6B+69eVhnsDN5SSUKn009VJeK2wmYKiIcr pD6zusnjN8rXGU6OzqwPlAML1STmHTJhyQf11y3VUMEOjR/ilganjnuYCvCKsxBKg3 M4S5V94XSJeRPz7C0p87Yuyr7kIdmp3ntcdJbhHk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Santosh Sivaraj , "Aneesh Kumar K . V" , Dan Williams , Sasha Levin , linux-nvdimm@lists.01.org Subject: [PATCH AUTOSEL 5.5 19/75] tools/test/nvdimm: Fix out of tree build Date: Sat, 18 Apr 2020 10:08:14 -0400 Message-Id: <20200418140910.8280-19-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418140910.8280-1-sashal@kernel.org> References: <20200418140910.8280-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: Santosh Sivaraj [ Upstream commit 1f776799628139d0da47e710ad86eb58d987ff66 ] Out of tree build using make M=tools/test/nvdimm O=/tmp/build -C /tmp/build fails with the following error make: Entering directory '/tmp/build' CC [M] tools/testing/nvdimm/test/nfit.o linux/tools/testing/nvdimm/test/nfit.c:19:10: fatal error: nd-core.h: No such file or directory 19 | #include | ^~~~~~~~~~~ compilation terminated. That is because the kbuild file uses $(src) which points to tools/testing/nvdimm, $(srctree) correctly points to root of the linux source tree. Reported-by: Aneesh Kumar K.V Signed-off-by: Santosh Sivaraj Link: https://lore.kernel.org/r/20200114054051.4115790-1-santosh@fossix.org Signed-off-by: Dan Williams Signed-off-by: Sasha Levin --- tools/testing/nvdimm/Kbuild | 4 ++-- tools/testing/nvdimm/test/Kbuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/nvdimm/Kbuild b/tools/testing/nvdimm/Kbuild index 6aca8d5be1593..0615fa3d9f7e9 100644 --- a/tools/testing/nvdimm/Kbuild +++ b/tools/testing/nvdimm/Kbuild @@ -22,8 +22,8 @@ DRIVERS := ../../../drivers NVDIMM_SRC := $(DRIVERS)/nvdimm ACPI_SRC := $(DRIVERS)/acpi/nfit DAX_SRC := $(DRIVERS)/dax -ccflags-y := -I$(src)/$(NVDIMM_SRC)/ -ccflags-y += -I$(src)/$(ACPI_SRC)/ +ccflags-y := -I$(srctree)/drivers/nvdimm/ +ccflags-y += -I$(srctree)/drivers/acpi/nfit/ obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o diff --git a/tools/testing/nvdimm/test/Kbuild b/tools/testing/nvdimm/test/Kbuild index fb3c3d7cdb9bd..75baebf8f4ba1 100644 --- a/tools/testing/nvdimm/test/Kbuild +++ b/tools/testing/nvdimm/test/Kbuild @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-y := -I$(src)/../../../../drivers/nvdimm/ -ccflags-y += -I$(src)/../../../../drivers/acpi/nfit/ +ccflags-y := -I$(srctree)/drivers/nvdimm/ +ccflags-y += -I$(srctree)/drivers/acpi/nfit/ obj-m += nfit_test.o obj-m += nfit_test_iomap.o -- 2.20.1