On Fri, Oct 06, 2023 at 10:32:20AM -0000, tip-bot2 for Muhammad Usama Anjum wrote: > The following commit has been merged into the locking/core branch of tip: > > Commit-ID: d351a9e56cc90a9ff694550e4b3bcaf51a391525 > Gitweb: https://git.kernel.org/tip/d351a9e56cc90a9ff694550e4b3bcaf51a391525 > Author: Muhammad Usama Anjum <usama.anjum@xxxxxxxxxxxxx> > AuthorDate: Fri, 06 Oct 2023 14:55:37 +05:00 > Committer: Ingo Molnar <mingo@xxxxxxxxxx> > CommitterDate: Fri, 06 Oct 2023 12:29:45 +02:00 > > locking/futex/selftests: Remove duplicate ABI defines > > Kselftests are kernel tests that are built with kernel headers > from the same source version. The kernel headers, which includes > current ABI definitions, are already being included correctly > in the futex selftest Makefile with the help of KHDR_INCLUDE, > no need to define them again. > > Remove duplicate ABI definitions, which is effectively dead code. > > No functional changes intended. so.. as it happens I recently built these things as stand-alone, and then you ver much end up using the system headers. Also see 20230922205449.808782861@xxxxxxxxxxxxx where I add more of this. Specifically, if one does: cd tools/testing/selftests/futex/functional; make You don't get kernel headers and stuff does not build. So no, I don't think this is superfluous. > > Signed-off-by: Muhammad Usama Anjum <usama.anjum@xxxxxxxxxxxxx> > Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> > Link: https://lore.kernel.org/r/20231006095539.1601385-1-usama.anjum@xxxxxxxxxxxxx > --- > tools/testing/selftests/futex/include/futextest.h | 22 +-------------- > 1 file changed, 22 deletions(-) > > diff --git a/tools/testing/selftests/futex/include/futextest.h b/tools/testing/selftests/futex/include/futextest.h > index ddbcfc9..59f66af 100644 > --- a/tools/testing/selftests/futex/include/futextest.h > +++ b/tools/testing/selftests/futex/include/futextest.h > @@ -25,28 +25,6 @@ > typedef volatile u_int32_t futex_t; > #define FUTEX_INITIALIZER 0 > > -/* Define the newer op codes if the system header file is not up to date. */ > -#ifndef FUTEX_WAIT_BITSET > -#define FUTEX_WAIT_BITSET 9 > -#endif > -#ifndef FUTEX_WAKE_BITSET > -#define FUTEX_WAKE_BITSET 10 > -#endif > -#ifndef FUTEX_WAIT_REQUEUE_PI > -#define FUTEX_WAIT_REQUEUE_PI 11 > -#endif > -#ifndef FUTEX_CMP_REQUEUE_PI > -#define FUTEX_CMP_REQUEUE_PI 12 > -#endif > -#ifndef FUTEX_WAIT_REQUEUE_PI_PRIVATE > -#define FUTEX_WAIT_REQUEUE_PI_PRIVATE (FUTEX_WAIT_REQUEUE_PI | \ > - FUTEX_PRIVATE_FLAG) > -#endif > -#ifndef FUTEX_REQUEUE_PI_PRIVATE > -#define FUTEX_CMP_REQUEUE_PI_PRIVATE (FUTEX_CMP_REQUEUE_PI | \ > - FUTEX_PRIVATE_FLAG) > -#endif > - > /** > * futex() - SYS_futex syscall wrapper > * @uaddr: address of first futex
|