From nobody Mon Jun 8 08:52:25 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2433F3CF67A; Wed, 3 Jun 2026 14:25:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780496701; cv=none; b=e88R30mSrAhhkbXqqLzVC/opAlFSAyWuJojsm9VgMFjL5CVCcm6Qnle7dod8pk/SjbnbKG9C5sd/uInRqzL2RGUSwAWtI+4RsavlOWvhJ/z5cy/+wUy3bncV3Z6oXso7VOk/vwVVGkQhuJ+x4aQ/yPzv1NxQtQlQL6LXRZY0ouc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780496701; c=relaxed/simple; bh=seu6qaeCv/g1ojY1ZfOJK53Gwv1/wpTCbqUt6euSxss=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=Wdqz9S1wljaqpRN/QOBGfMJWnCyTBJsLXRyVWVLVNwRCKNz3vkYi3DokC+UpyE0760n31CUVLsLc240ABLqaI0kraR+IgJiXxl9lKc3T8jn5CQ7QQaT8VDW7Oe16L6s+9H0FLmPPAbPpYsmvW2SX+gL8dLkyZvXA68qw2fsL0Vs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=VVedtMnj; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=iDJSdj8+; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="VVedtMnj"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="iDJSdj8+" Date: Wed, 03 Jun 2026 14:24:57 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1780496698; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qY+okrBief3/BtdWnfaBTyAQMZkXOvOlSbAHiX9h+kg=; b=VVedtMnjqRGm2Jaz0QBtTT4x+OdLumdFALQpNgQDZdMCBTly8KNhG2vBTlTrPrthfntBSO k+SHcAPnzBb055DwDByixDsIY2UHta7rJ4PDg1cBzkgcZ+CHMzQB5GH4QAbmn/2hUGO15p 9CI0GaZY0d95wWgYd7Wo8ZLtPR9g9VKNfhM2spBVrXOTbVSYCt7b2F5eseHCBpwI+sIyLD QFBqRfNau/TZcIq3oihRgm0YAH37ln7EJ/+ugIRibVHmhI+GDYwNS64nC3/Nhh3VZnRNwi rzaTP101PDVHEXjmsRzoI4xsiO9LwlEWSEgSKhDHcRKbisCfgD9zdMjmhjAVWg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1780496698; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qY+okrBief3/BtdWnfaBTyAQMZkXOvOlSbAHiX9h+kg=; b=iDJSdj8+OMMsvCGYJLgd/mUaOq+uBPPTmhgcIituA46VBooNE5oE2J6ZzWwzPmNN5CHgRn 9T48/wqTm72CkLCQ== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/core] futex: Cleanup UAPI defines Cc: Thomas Gleixner , "Peter Zijlstra (Intel)" , andrealmeid@igalia.com, x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260602090535.615600933@kernel.org> References: <20260602090535.615600933@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178049669727.710.3503929185301672741.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the locking/core branch of tip: Commit-ID: 1fd053d26f0333485cdbaa9d6e7b8cb53f54de95 Gitweb: https://git.kernel.org/tip/1fd053d26f0333485cdbaa9d6e7b8cb53= f54de95 Author: Thomas Gleixner AuthorDate: Tue, 02 Jun 2026 11:09:51 +02:00 Committer: Peter Zijlstra CommitterDate: Wed, 03 Jun 2026 11:38:51 +02:00 futex: Cleanup UAPI defines Make the operand defines tabular for readability sake. Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Andr=C3=A9 Almeida Link: https://patch.msgid.link/20260602090535.615600933@kernel.org --- include/uapi/linux/futex.h | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/include/uapi/linux/futex.h b/include/uapi/linux/futex.h index 29bf2f6..75df1ea 100644 --- a/include/uapi/linux/futex.h +++ b/include/uapi/linux/futex.h @@ -25,23 +25,22 @@ =20 #define FUTEX_PRIVATE_FLAG 128 #define FUTEX_CLOCK_REALTIME 256 -#define FUTEX_CMD_MASK ~(FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIME) - -#define FUTEX_WAIT_PRIVATE (FUTEX_WAIT | FUTEX_PRIVATE_FLAG) -#define FUTEX_WAKE_PRIVATE (FUTEX_WAKE | FUTEX_PRIVATE_FLAG) -#define FUTEX_REQUEUE_PRIVATE (FUTEX_REQUEUE | FUTEX_PRIVATE_FLAG) -#define FUTEX_CMP_REQUEUE_PRIVATE (FUTEX_CMP_REQUEUE | FUTEX_PRIVATE_FLAG) -#define FUTEX_WAKE_OP_PRIVATE (FUTEX_WAKE_OP | FUTEX_PRIVATE_FLAG) -#define FUTEX_LOCK_PI_PRIVATE (FUTEX_LOCK_PI | FUTEX_PRIVATE_FLAG) -#define FUTEX_LOCK_PI2_PRIVATE (FUTEX_LOCK_PI2 | FUTEX_PRIVATE_FLAG) -#define FUTEX_UNLOCK_PI_PRIVATE (FUTEX_UNLOCK_PI | FUTEX_PRIVATE_FLAG) -#define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG) + +#define FUTEX_CMD_MASK ~(FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIME) + +#define FUTEX_WAIT_PRIVATE (FUTEX_WAIT | FUTEX_PRIVATE_FLAG) +#define FUTEX_WAKE_PRIVATE (FUTEX_WAKE | FUTEX_PRIVATE_FLAG) +#define FUTEX_REQUEUE_PRIVATE (FUTEX_REQUEUE | FUTEX_PRIVATE_FLAG) +#define FUTEX_CMP_REQUEUE_PRIVATE (FUTEX_CMP_REQUEUE | FUTEX_PRIVATE_FLAG) +#define FUTEX_WAKE_OP_PRIVATE (FUTEX_WAKE_OP | FUTEX_PRIVATE_FLAG) +#define FUTEX_LOCK_PI_PRIVATE (FUTEX_LOCK_PI | FUTEX_PRIVATE_FLAG) +#define FUTEX_LOCK_PI2_PRIVATE (FUTEX_LOCK_PI2 | FUTEX_PRIVATE_FLAG) +#define FUTEX_UNLOCK_PI_PRIVATE (FUTEX_UNLOCK_PI | FUTEX_PRIVATE_FLAG) +#define FUTEX_TRYLOCK_PI_PRIVATE (FUTEX_TRYLOCK_PI | FUTEX_PRIVATE_FLAG) #define FUTEX_WAIT_BITSET_PRIVATE (FUTEX_WAIT_BITSET | FUTEX_PRIVATE_FLAG) #define FUTEX_WAKE_BITSET_PRIVATE (FUTEX_WAKE_BITSET | FUTEX_PRIVATE_FLAG) -#define FUTEX_WAIT_REQUEUE_PI_PRIVATE (FUTEX_WAIT_REQUEUE_PI | \ - FUTEX_PRIVATE_FLAG) -#define FUTEX_CMP_REQUEUE_PI_PRIVATE (FUTEX_CMP_REQUEUE_PI | \ - FUTEX_PRIVATE_FLAG) +#define FUTEX_WAIT_REQUEUE_PI_PRIVATE (FUTEX_WAIT_REQUEUE_PI | FUTEX_PRIVA= TE_FLAG) +#define FUTEX_CMP_REQUEUE_PI_PRIVATE (FUTEX_CMP_REQUEUE_PI | FUTEX_PRIVATE= _FLAG) =20 /* * Flags for futex2 syscalls.