From patchwork Mon Mar 1 16:09:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 388674 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3561575jap; Mon, 1 Mar 2021 09:54:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJw4tJi2pjUMI66Ztxup4VJS+JRg2qtUDVUnlq953V380E38l/l4X4nMJmjq9uCZ4CrHHQZS X-Received: by 2002:a17:902:24d:b029:e3:cfa7:e308 with SMTP id 71-20020a170902024db02900e3cfa7e308mr16272952plc.82.1614621254090; Mon, 01 Mar 2021 09:54:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614621254; cv=none; d=google.com; s=arc-20160816; b=b9LrlTZwJOKSeAXLTeb7b2W1TIQ7O3KCyjOibQmMRwZej+KK3rGg2+BnxG0MeWwcDG +YbdGgM6Nrch9Pwffk/2Wn5jDylDOh0UtDlAZuueHGcVp6xjGuRm6GLAUrq/EkZSIFHH cunwvUfxd5DNLaQC4CIjZlrycZgrYpX/4aYZMZz73STFaN6a1lvw3WSpsVZJeJPMKeC/ UkUSimvjkRME0/hn9y8l6XJ8vqwMlCUoAko1i4pi0z4HBWnjwbd0/dKmi+dCtc7uZzN5 BZUEy9vPu4UbkyzXPpfQA6XUBCLhgs+HG4QYvXKVh8bwJe6YqmfvoFqX1QIlLtITI+1B fkeQ== 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=g0E/2kQmWBKI1bnmSbTvYezWwaixC9H0hN1SyRTev0AUWsjCeB9NB6ftgG3ob+NYek lxqCAljcoTTSpnt1Jh66MBzv2WHCfaOTjAAvbp0cxkhlwsawCjavqzvQV/pDEZTJ8A3a q4P9VY0ah6+nNXICmIwEZPQ/pHFAK68S7o3NQRa98pUuDiwuyvtg2LKjK3vT0+ZK9MK9 choOWvQSWxe5WUEZ3mkvORCfGrZ5RGjFD8zHrjqhKhaUQp8cvRBlY78HlGes+7CCio54 +jaKp8/nV+kaYarbi709wMjgBhLPVy0yCiF+IDiD/8b1VxS/5SRnm0UGXWH+8j8TkGAk jexw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linuxfoundation.org header.s=korg header.b=YR6I3FEw; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id 62si19190492plb.210.2021.03.01.09.54.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 09:54:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linuxfoundation.org header.s=korg header.b=YR6I3FEw; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 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 69CC46E875; Mon, 1 Mar 2021 17:54:10 +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 892D66E875 for ; Mon, 1 Mar 2021 17:54:09 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 96BCC65366; Mon, 1 Mar 2021 17:54:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614621249; bh=vmBJfQov9r+kOBWsOrfukGcLZjgVtA6JQZx4OWgTqvY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YR6I3FEw7LU2fHM9LIeEZpZfTTm35rUrI+r8rZsfDZLSjpuPTJDNoIyGy1TNSwgWu M/dbLuebD9qOKSVvEMxvSSLOKt5SRth6v4rKBJ2VmHrumRg1CRVhLSSQ4/mLt4de01 eSV4Wn3yIZXvILWhDZeI8+y4GY7iml5pB2L4fcXc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Subject: [PATCH 5.11 430/775] kselftests: dmabuf-heaps: Fix Makefiles inclusion of the kernels usr/include dir Date: Mon, 1 Mar 2021 17:09:58 +0100 Message-Id: <20210301161222.820380302@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161201.679371205@linuxfoundation.org> References: <20210301161201.679371205@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