From nobody Sun Feb 8 18:24:35 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 C416529CB30; Fri, 11 Apr 2025 10:01:46 +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=1744365708; cv=none; b=LDQJryQwyq5TdSFFdwtQ1eMjB/3IVYhGXfhs5WlcsASQt7OVYzb2j5qYPlNYmG7aYOINycUTyk7LwnJc+1vuH+M1AmB+mQfrVlLeHbbbP49bYlVSbhpl5pSIBp7N1eEdxu2nN4ollyGJjoj2VxBzSFdVrRjph5IzLFM+LOfEN6M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744365708; c=relaxed/simple; bh=1BF5JN6E4206BpgsawGbm7jRbwIKDsZz30DXtbvXufM=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=tcZpulG07spuUmz4R1bx+wHTeJy1j22Np3yGAQF2kSgYukPE+A8oKO4yAV3EnvhXkjFtddA97UwP8XKACbAS/pC2yFhc/PoAQB0alAE7uAKqX0oU6ePMDk8TnPAzaeYvD6GMmmwfd8j5eZPLQ3wT0U2UiQi7YiQNSYgG/FTfo3U= 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=YrL0kBYv; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=d2w32jmi; 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="YrL0kBYv"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="d2w32jmi" Date: Fri, 11 Apr 2025 10:01:43 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1744365705; 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=FQ4/KU8G1/Y5QAXX/mDhj1OTycS6qSzfWgFJSM5qPdg=; b=YrL0kBYvyOWzkt7+RJ9TogGWnvge4HDORkq2sQLqgPiwwF5nYy5znIdSpZQCmXV12iw/tg 1BO6hac39739T4fjvtANWLP+EoDFIlvOn4dBDZzttXO4KgplUzRrhmhpziQTREKROt/Er+ /nodwbBOXzKYgkfGwsdJhSBR4wGzSfcs53/qivcQ8FDlooWyraEL3nviiHIh6UJdvAxza2 BnYPAa1ddLtdBcgcZkg1t5jR4QyTHch0RZubebTKL4f7L9EFyQZnBMTeCD1C2WuIgLpALn ZdBPZA5ECbrp9iwHP3EeXIirbF378yDJYe+riX5RQ2esNFhJ0n5EuZee43QpoQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1744365705; 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=FQ4/KU8G1/Y5QAXX/mDhj1OTycS6qSzfWgFJSM5qPdg=; b=d2w32jmiiMnHAI02O2CX0BD9vxNv3ritdlWAxdB19nhp/VaqyPIDoQ3v6KXl2urZZdZifG VEo/vsZGLJCg51AA== From: "tip-bot2 for Ingo Molnar" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/alternatives] x86/alternatives: Rename 'TP_ARRAY_NR_ENTRIES_MAX' to 'TEXT_POKE_ARRAY_MAX' Cc: Ingo Molnar , Juergen Gross , "H . Peter Anvin" , Linus Torvalds , Peter Zijlstra , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20250411054105.2341982-46-mingo@kernel.org> References: <20250411054105.2341982-46-mingo@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <174436570322.31282.14572126951630035584.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 x86/alternatives branch of ti= p: Commit-ID: 8036fbe5a5d618be3694c4719afb14fd14cc972d Gitweb: https://git.kernel.org/tip/8036fbe5a5d618be3694c4719afb14fd1= 4cc972d Author: Ingo Molnar AuthorDate: Fri, 11 Apr 2025 07:40:57 +02:00 Committer: Ingo Molnar CommitterDate: Fri, 11 Apr 2025 11:01:35 +02:00 x86/alternatives: Rename 'TP_ARRAY_NR_ENTRIES_MAX' to 'TEXT_POKE_ARRAY_MAX' Standardize on TEXT_POKE_ namespace for CPP constants too. Signed-off-by: Ingo Molnar Cc: Juergen Gross Cc: "H . Peter Anvin" Cc: Linus Torvalds Cc: Peter Zijlstra Link: https://lore.kernel.org/r/20250411054105.2341982-46-mingo@kernel.org --- arch/x86/kernel/alternative.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index c5abcf9..4b460de 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -2466,10 +2466,10 @@ struct smp_text_poke_loc { u8 old; }; =20 -#define TP_ARRAY_NR_ENTRIES_MAX (PAGE_SIZE / sizeof(struct smp_text_poke_l= oc)) +#define TEXT_POKE_ARRAY_MAX (PAGE_SIZE / sizeof(struct smp_text_poke_loc)) =20 static struct smp_text_poke_array { - struct smp_text_poke_loc vec[TP_ARRAY_NR_ENTRIES_MAX]; + struct smp_text_poke_loc vec[TEXT_POKE_ARRAY_MAX]; int nr_entries; } text_poke_array; =20 @@ -2863,7 +2863,7 @@ static void smp_text_poke_batch_flush(void *addr) { lockdep_assert_held(&text_mutex); =20 - if (text_poke_array.nr_entries =3D=3D TP_ARRAY_NR_ENTRIES_MAX || !text_po= ke_addr_ordered(addr)) + if (text_poke_array.nr_entries =3D=3D TEXT_POKE_ARRAY_MAX || !text_poke_a= ddr_ordered(addr)) smp_text_poke_batch_process(); }