From patchwork Tue Mar 7 17:00:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 660829 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 4CCECC678DB for ; Tue, 7 Mar 2023 17:57:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229997AbjCGR5R (ORCPT ); Tue, 7 Mar 2023 12:57:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230449AbjCGR4h (ORCPT ); Tue, 7 Mar 2023 12:56:37 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55B4DA42E4; Tue, 7 Mar 2023 09:51:16 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id CFDD46150B; Tue, 7 Mar 2023 17:51:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C649DC433EF; Tue, 7 Mar 2023 17:51:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678211475; bh=1wp6KRdE+bLfwNIQVVo0S2DK2+rZhuoRBfb4QbiqvSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ThSjbpQkD9rToGI1Wq2LgwLv8KHoy1FfLsuKEPNikr8JC9Yyg43zM/QX1+K2aT+c/ 2O6m3Hgjhg7T1zYOsk91c5gDqA82acEnjoO7/Xxj3RDkJ+C5mxGFytJKiSeyTVMsFo jJq0Ua0+D400FRUPkne1aqS4qM+bU71O7Xsp2Ah8= 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 0875/1001] selftests: futex: Fix incorrect kernel headers search path Date: Tue, 7 Mar 2023 18:00:47 +0100 Message-Id: <20230307170059.868603932@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 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org From: Mathieu Desnoyers commit 24c55275ba0d538def2b1220002d0e808a85d50f 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/futex/functional/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/tools/testing/selftests/futex/functional/Makefile +++ b/tools/testing/selftests/futex/functional/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -INCLUDES := -I../include -I../../ -I../../../../../usr/include/ +INCLUDES := -I../include -I../../ $(KHDR_INCLUDES) CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE -pthread $(INCLUDES) $(KHDR_INCLUDES) LDLIBS := -lpthread -lrt