[1/5] kselftests: dmabuf-heaps: Fix Makefile's inclusion of the kernel's usr/include dir
| Message ID | 20210129030514.1231773-1-john.stultz@linaro.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers |
Received: from vger.kernel.org ([23.128.96.18])
by www.linuxtv.org with esmtp (Exim 4.92)
(envelope-from <linux-media-owner@vger.kernel.org>)
id 1l5K6i-0014dN-NC; Fri, 29 Jan 2021 03:06:01 +0000
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S231627AbhA2DF7 (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other);
Thu, 28 Jan 2021 22:05:59 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35982 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S231210AbhA2DF6 (ORCPT
<rfc822;linux-media@vger.kernel.org>);
Thu, 28 Jan 2021 22:05:58 -0500
Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com
[IPv6:2607:f8b0:4864:20::62b])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD9EFC061574
for <linux-media@vger.kernel.org>;
Thu, 28 Jan 2021 19:05:17 -0800 (PST)
Received: by mail-pl1-x62b.google.com with SMTP id h15so4473937pli.8
for <linux-media@vger.kernel.org>;
Thu, 28 Jan 2021 19:05:17 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google;
h=from:to:cc:subject:date:message-id:mime-version
:content-transfer-encoding;
bh=6FtqZbVLoNhYzW/5zxBFGSTg2OJ2tv0Ub0qNAJ13xHs=;
b=j5yLzHZt+6y1rTjQAaHsDOTxGgaIO1Q9C9yvGJP/x3SkVLLnhJSUKnESb/H0Z9JJM3
X3o9CasXX6DZTksNat7StXwigWk+Orm9ia/zA32HYjwgB7fSoTv26tV1S3bs6YrGsFEp
z4HPk5S+5CgJFgVQdxw+V7SZtaTKny8EBvZ3oJTURUzJ+ccHaYle+g1y092cga4L8huN
RJggFGQ7Nhlb7TYWCH0Ubq1AsPnmdAUnLmHsDZinfH7eAFf/GnRcL4Dm4SijBHNx+FHZ
Bw43r3f9o5DaCRZX9xsjG0o3Lr7MVysYUjjKamy51VBjfsyrADAgEtsWNzZdhWgazp4N
PuAg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version
:content-transfer-encoding;
bh=6FtqZbVLoNhYzW/5zxBFGSTg2OJ2tv0Ub0qNAJ13xHs=;
b=W7tLQU9Zwpi156xsVMHAycdq8+pAXXHrSjF46uJqiG8cXR+tUPYWvrYgV9kq4SvICM
bkU+d4+GyoxW+eo5FMEDFURhLVWcduD8N3xZGUUD43vNcdrUJtsL55T+lZ3iWdXctBuJ
IKUuNFdn3WLEZN7eqT5mdQMo+xwbnPjqFO7x4uek4UpYhEMGngEXrA51mcK4Md0s+Q4D
5nhKvsu5C0zZmkalupYZ2p3uwCv3ppaqgeK82MO5s0kf11maZhxoWe1efX5Z4XD5ysYK
gKrlxwqGkODJ4uk3FWQ/axSQVabXzeFge4EmAra2Lo6Wkr5aieRoRyGs/ZBriiFYtEW1
DkPQ==
X-Gm-Message-State: AOAM533U/e+qr1cpPl9Sr6tCX9wmflHY16rGREFZBeCukNheluH64PTx
sEecwIWE0wduhMb24+m3p//1tQ==
X-Google-Smtp-Source:
ABdhPJxNcoBMcdOeDQYd3FdgzjZ86Cf272Rz2la9I9NvjeaL4IhlWxZTBvB3/43QEa/+/6QJlLWKNA==
X-Received: by 2002:a17:90a:d913:: with SMTP id
c19mr2416772pjv.19.1611889517371;
Thu, 28 Jan 2021 19:05:17 -0800 (PST)
Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81])
by smtp.gmail.com with ESMTPSA id
y75sm6854496pfg.119.2021.01.28.19.05.15
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 28 Jan 2021 19:05:16 -0800 (PST)
From: John Stultz <john.stultz@linaro.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: John Stultz <john.stultz@linaro.org>,
Shuah Khan <shuah@kernel.org>,
Brian Starkey <brian.starkey@arm.com>,
Sumit Semwal <sumit.semwal@linaro.org>,
Laura Abbott <labbott@kernel.org>,
Hridya Valsaraju <hridya@google.com>,
Suren Baghdasaryan <surenb@google.com>,
Sandeep Patil <sspatil@google.com>,
Daniel Mentz <danielmentz@google.com>,
linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-kselftest@vger.kernel.org
Subject: [PATCH 1/5] kselftests: dmabuf-heaps: Fix Makefile's inclusion of the
kernel's usr/include dir
Date: Fri, 29 Jan 2021 03:05:10 +0000
Message-Id: <20210129030514.1231773-1-john.stultz@linaro.org>
X-Mailer: git-send-email 2.25.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk
List-ID: <linux-media.vger.kernel.org>
X-Mailing-List: linux-media@vger.kernel.org
X-LSpam-Score: -2.5 (--)
X-LSpam-Report: No,
score=-2.5 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1
autolearn=ham autolearn_force=no
|
| Series |
[1/5] kselftests: dmabuf-heaps: Fix Makefile's inclusion of the kernel's usr/include dir
|
|
Commit Message
John Stultz
Jan. 29, 2021, 3:05 a.m. UTC
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 <shuah@kernel.org>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Laura Abbott <labbott@kernel.org>
Cc: Hridya Valsaraju <hridya@google.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Sandeep Patil <sspatil@google.com>
Cc: Daniel Mentz <danielmentz@google.com>
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 <john.stultz@linaro.org>
---
tools/testing/selftests/dmabuf-heaps/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 1/28/21 8:05 PM, John Stultz wrote: > 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 <shuah@kernel.org> > Cc: Brian Starkey <brian.starkey@arm.com> > Cc: Sumit Semwal <sumit.semwal@linaro.org> > Cc: Laura Abbott <labbott@kernel.org> > Cc: Hridya Valsaraju <hridya@google.com> > Cc: Suren Baghdasaryan <surenb@google.com> > Cc: Sandeep Patil <sspatil@google.com> > Cc: Daniel Mentz <danielmentz@google.com> > 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 <john.stultz@linaro.org> > --- > tools/testing/selftests/dmabuf-heaps/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/dmabuf-heaps/Makefile b/tools/testing/selftests/dmabuf-heaps/Makefile > index 607c2acd2082..604b43ece15f 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 > > Thanks John for all these 5 fix and cleanup patches. Applied to linux-kselftest next for 5.12-rc1 thanks, -- Shuah
On Mon, Feb 8, 2021 at 3:23 PM Shuah Khan <skhan@linuxfoundation.org> wrote: > On 1/28/21 8:05 PM, John Stultz wrote: > Thanks John for all these 5 fix and cleanup patches. > > Applied to linux-kselftest next for 5.12-rc1 > Great! I was just prepping to resend them :) Thanks so much! -john
diff --git a/tools/testing/selftests/dmabuf-heaps/Makefile b/tools/testing/selftests/dmabuf-heaps/Makefile index 607c2acd2082..604b43ece15f 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