Messages in this thread | | | Subject | Re: [PATCH 1/5] kselftests: dmabuf-heaps: Fix Makefile's inclusion of the kernel's usr/include dir | From | Shuah Khan <> | Date | Mon, 8 Feb 2021 16:23:48 -0700 |
| |
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
| |