Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1749153ybz; Sat, 18 Apr 2020 07:43:00 -0700 (PDT) X-Google-Smtp-Source: APiQypKrUOhSuKSlOqkqIwumyfvojLxIy+BLReuiua1LQ1cKBnVrIgL1qsd8+l+9O4ZvYx0rnjum X-Received: by 2002:a50:a68a:: with SMTP id e10mr7297814edc.113.1587220980089; Sat, 18 Apr 2020 07:43:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587220980; cv=none; d=google.com; s=arc-20160816; b=F+LWtKCE5dV6DPNWsft1mpC5eSxMnoE/Yp8O0R+nikWltmNw0lkb5leWiANYWLZqb1 CH+WLkaYGWcK684F1bzy4a9ErRTeXkCUSCj1v7gUDK7p/HE30Z44+sXg0EheYFs5txuW g8qEJQlzF+uhowI9HK7lfy6qzhaOTsqjQrCvdX1Avx5g4BAUkHX3QhU5iDlX05PDtY/D ebjagAR8g8xecWpgxI81mOTKpXfaxBmso7tQaU8gfi0u6QYv2zArH6YmfgqOR+ic4Ul4 4u6ZhAqytmRsJKZRYx5yz6GMNXH5mljuJA43A5+n1AZaAvaApKvTcQDpPN2CDWerJgcG oquQ== 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=mEZGIOlvob4f+QA405wFpLTUaJpp27NcnxYirH01jbM=; b=H1nJksOWmRB8ZW7UzE8W3/P9oLKDrTVHlQc/M+YR0Z30PwHduNdaEaX3vTz8HcbXk5 usXiuKaqBsTJp2qdsm1wGNi0QEGDhRylMjv0yXMs/ftzt6g11j7n3jxVduLISeRY95T/ oM58Qqcg1Q3nSVwDMks0Vk41yvbDj7sToR+NzNPuI7C8UhKA3ARPKdJrzEhehLMTL+RZ 56ZMAEurN9r77Jy6rCs/KYjhmtDuIfVoIJrDruj5FBghvtgH0/xSnUJkxwZlGlql7Cwg Gd5XvBDfhVt0BnLhAOLdRoXufv9GFsHc2KQPp7gvdaPMlL+mMsTHTZqhosrQ6oEJdnZl 9s/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=EhouNq0b; 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 rs7si5420993ejb.533.2020.04.18.07.42.37; Sat, 18 Apr 2020 07:43:00 -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=EhouNq0b; 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 S1727831AbgDROlO (ORCPT + 99 others); Sat, 18 Apr 2020 10:41:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:49946 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727789AbgDROlK (ORCPT ); Sat, 18 Apr 2020 10:41:10 -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 08BD121974; Sat, 18 Apr 2020 14:41:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587220869; bh=SgIOKnFekVTZdbg62jtE6S/vCStCN4oFmWjvD0J3m0Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EhouNq0b9t5KMThH1WQiovYXvI/1VAmFFZP85TdJ7M79AKFVcuZmSOeC6ku445T0P 2d2gcpF4RzlSIOfL7uRsVjH7fshHybOir2nASnXKqN3FHCTu94BpOsyyAMtRBudKAY LaJhiIAJxPog5flGh9fu+Y2pID+OhYTYFhvtf52A= 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.4 18/78] tools/test/nvdimm: Fix out of tree build Date: Sat, 18 Apr 2020 10:39:47 -0400 Message-Id: <20200418144047.9013-18-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418144047.9013-1-sashal@kernel.org> References: <20200418144047.9013-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 c4a9196d794c9..cb80d3b811792 100644 --- a/tools/testing/nvdimm/Kbuild +++ b/tools/testing/nvdimm/Kbuild @@ -21,8 +21,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