From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3F047BA3E for ; Tue, 7 Mar 2023 17:49:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA270C433D2; Tue, 7 Mar 2023 17:49:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678211352; bh=QidwShXfMRr2trNKEdef8DsuyD+LIdNpkzWElpk+xrA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dNn3wePG5zUylWE5qMt6GbX5H6AGrxMVviOuaoJFV1zzzgPOUF5TTcz1s8IbNEGVH Z4B7OXfYp+Y0aw3M8suegwumaHrlkdIut8Sd53CEztcAOgDgMUh0RUnAk+IJluqPSU qurunWwmfJWsrGi838cTUaPVoXUQbV8z/JyztKpk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mathieu Desnoyers , Shuah Khan , linux-kselftest@vger.kernel.org, Ingo Molnar , Shuah Khan Subject: [PATCH 6.2 0835/1001] selftests: x86: Fix incorrect kernel headers search path Date: Tue, 7 Mar 2023 18:00:07 +0100 Message-Id: <20230307170058.033357851@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307170022.094103862@linuxfoundation.org> References: <20230307170022.094103862@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Mathieu Desnoyers commit ac5ec90e94fe8eddb4499e51398640fa6a89d657 upstream. Use $(KHDR_INCLUDES) as lookup path for kernel headers. This prevents building against kernel headers from the build environment in scenarios where kernel headers are installed into a specific output directory (O=...). Signed-off-by: Mathieu Desnoyers Cc: Shuah Khan Cc: linux-kselftest@vger.kernel.org Cc: Ingo Molnar Cc: # 5.18+ Signed-off-by: Shuah Khan Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/x86/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/tools/testing/selftests/x86/Makefile +++ b/tools/testing/selftests/x86/Makefile @@ -34,7 +34,7 @@ BINARIES_64 := $(TARGETS_C_64BIT_ALL:%=% BINARIES_32 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_32)) BINARIES_64 := $(patsubst %,$(OUTPUT)/%,$(BINARIES_64)) -CFLAGS := -O2 -g -std=gnu99 -pthread -Wall +CFLAGS := -O2 -g -std=gnu99 -pthread -Wall $(KHDR_INCLUDES) # call32_from_64 in thunks.S uses absolute addresses. ifeq ($(CAN_BUILD_WITH_NOPIE),1)