| Message ID | 20231006095539.1601385-1-usama.anjum@collabora.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] selftests: futex: remove duplicate unneeded defines | expand |
On 10/6/23 03:55, Muhammad Usama Anjum wrote: > Kselftests are kernel tests and must be build with kernel headers from > same source version. The kernel headers are already being included > correctly in futex selftest Makefile with the help of KHDR_INCLUDE. In > this patch, only the dead code is being removed. No functional change is > intended. > > Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> > --- Applied to linux-kselftest next for Linux 6.7-rc1. thanks, -- Shuah
On Mon, Oct 16, 2023 at 01:21:20PM -0600, Shuah Khan wrote: > On 10/6/23 03:55, Muhammad Usama Anjum wrote: > > Kselftests are kernel tests and must be build with kernel headers from > > same source version. The kernel headers are already being included > > correctly in futex selftest Makefile with the help of KHDR_INCLUDE. In > > this patch, only the dead code is being removed. No functional change is > > intended. > > > > Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> > > --- > > Applied to linux-kselftest next for Linux 6.7-rc1. Please don't.
On 10/16/23 15:43, Peter Zijlstra wrote: > On Mon, Oct 16, 2023 at 01:21:20PM -0600, Shuah Khan wrote: >> On 10/6/23 03:55, Muhammad Usama Anjum wrote: >>> Kselftests are kernel tests and must be build with kernel headers from >>> same source version. The kernel headers are already being included >>> correctly in futex selftest Makefile with the help of KHDR_INCLUDE. In >>> this patch, only the dead code is being removed. No functional change is >>> intended. >>> >>> Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> >>> --- >> >> Applied to linux-kselftest next for Linux 6.7-rc1. > > Please don't. Okay - will drop it. thanks, -- Shuah
diff --git a/tools/testing/selftests/futex/include/futextest.h b/tools/testing/selftests/futex/include/futextest.h index ddbcfc9b7bac4..59f66af3a6d10 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
Kselftests are kernel tests and must be build with kernel headers from same source version. The kernel headers are already being included correctly in futex selftest Makefile with the help of KHDR_INCLUDE. In this patch, only the dead code is being removed. No functional change is intended. Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> --- Changes since v1: - Make the explanation correct --- .../selftests/futex/include/futextest.h | 22 ------------------- 1 file changed, 22 deletions(-)