From patchwork Mon Mar 1 16:10:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 388663 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3534749jap; Mon, 1 Mar 2021 09:19:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJyNQr89GKfcwsejA5Ep3v/LakJJeklxMBAxEky5UswIalNNZQG27rzOVxAa4iCh8oolt9pl X-Received: by 2002:a63:5444:: with SMTP id e4mr11648820pgm.426.1614619173092; Mon, 01 Mar 2021 09:19:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614619173; cv=none; d=google.com; s=arc-20160816; b=GLfrrztYYH0Rr9k7Ab0YH/NXRwI7ZJ+aSq/aq0TNSL4bIglb13RjNAC/dHimy7z+jm eR6lW7uvCXNo/nHjxzCVDq+v3mvEUebpHCW8Ms1Rrn7uDhm9u8iwyYyADTUUOLyuYel3 ben1wLb8HURIGK78KWKQLYil80q1qGEIOu5m5xXjKOTwE76JIUFxnl0jEfZYGGFpXXeI 6nBzOGrG9KkxAAlCnT4VYdfbvlhx0LQh7YAdl+2mfFY7cO6wslbFarpMPj/aVt+PjqZT bbOWX8eUSotgfp74JE0yWIKV1al7oJZXofGqFzrvwPhG4zOsHxuKcACnpYrlvSxfAbX9 LUyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:user-agent:references:in-reply-to :message-id:date:subject:to:from:dkim-signature:delivered-to; bh=0sgseIbc0wuLS0nlFEro8q9tSLUFMMUAGCagBtMipxU=; b=sjP34Rd38xMf3H4/BQcTWtqTmql3SC/2dGo3iw7WnKat412zXYhj4mNYL8NZ70UhCL oiBc3/bmzxtRxZsY8Eewo9Ph1ML0Va1KJK/fG7UVoh0cHQzN3CvvnkP68MHC1KywTMyK 48vXHk46p8NjdMl4gsffZCvxDh5P3u2Ttjs9nuZX8dmf/YO82TA15mPhgW8SJWoxDAx5 SkFqYji9DF7r2eir8Mnm9RUvYeaH898otoWIj6CR/J5lT6Uy2e6igJx3uoaKgql2sXPd 6faGBWDRpu/FaCeLb7/GgMwFjpyDTIHATxZXZMAezivwoebQRxQLkoRCbP2tjkAKiKI5 L5OQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linuxfoundation.org header.s=korg header.b=wfABAUo5; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id d19si18115104pls.412.2021.03.01.09.19.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 09:19:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linuxfoundation.org header.s=korg header.b=wfABAUo5; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 977306E849; Mon, 1 Mar 2021 17:19:29 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1F2BA6E849 for ; Mon, 1 Mar 2021 17:19:28 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 4A8FA651E8; Mon, 1 Mar 2021 17:19:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614619167; bh=vmBJfQov9r+kOBWsOrfukGcLZjgVtA6JQZx4OWgTqvY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wfABAUo5e7dKE4OAX2QsXeyzXG5w0LhWCp9pCCkHl+w4CJkahsIOm6HrmwfTrbWYR GbfhCbXXXlFfrzE1Uk0KVEdnrXBKrhbasU6vfEE3RX6XgzDi35QTHlU38RpxHfCF2T xipuR9/aiYaIWixhviNMZzcFpqF6kMCu1S2Jxuas= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Subject: [PATCH 5.10 355/663] kselftests: dmabuf-heaps: Fix Makefiles inclusion of the kernels usr/include dir Date: Mon, 1 Mar 2021 17:10:03 +0100 Message-Id: <20210301161159.422940508@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161141.760350206@linuxfoundation.org> References: <20210301161141.760350206@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Sandeep Patil , Greg Kroah-Hartman , dri-devel@lists.freedesktop.org, stable@vger.kernel.org, Suren Baghdasaryan , Laura Abbott , linux-kselftest@vger.kernel.org, Shuah Khan , Hridya Valsaraju , linux-media@vger.kernel.org, Shuah Khan , Daniel Mentz Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: John Stultz [ Upstream commit 64ba3d591c9d2be2a9c09e99b00732afe002ad0d ] Copied in from somewhere else, the makefile was including the kerne's usr/include dir, which caused the asm/ioctl.h file to be used. Unfortunately, that file has different values for _IOC_SIZEBITS and _IOC_WRITE than include/uapi/asm-generic/ioctl.h which then causes the _IOCW macros to give the wrong ioctl numbers, specifically for DMA_BUF_IOCTL_SYNC. This patch simply removes the extra include from the Makefile Cc: Shuah Khan Cc: Brian Starkey Cc: Sumit Semwal Cc: Laura Abbott Cc: Hridya Valsaraju Cc: Suren Baghdasaryan Cc: Sandeep Patil Cc: Daniel Mentz Cc: linux-media@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: linux-kselftest@vger.kernel.org Fixes: a8779927fd86c ("kselftests: Add dma-heap test") Signed-off-by: John Stultz Signed-off-by: Shuah Khan Signed-off-by: Sasha Levin --- tools/testing/selftests/dmabuf-heaps/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.27.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/tools/testing/selftests/dmabuf-heaps/Makefile b/tools/testing/selftests/dmabuf-heaps/Makefile index 607c2acd20829..604b43ece15f5 100644 --- a/tools/testing/selftests/dmabuf-heaps/Makefile +++ b/tools/testing/selftests/dmabuf-heaps/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -CFLAGS += -static -O3 -Wl,-no-as-needed -Wall -I../../../../usr/include +CFLAGS += -static -O3 -Wl,-no-as-needed -Wall TEST_GEN_PROGS = dmabuf-heap