From nobody Sun Feb 8 18:35:29 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 BCE4A29AB0F; Fri, 11 Apr 2025 10:01:42 +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=1744365705; cv=none; b=aZtKnnJJJd4BL64QMMKetq40Tzknjus0DZ3k2JIqgo0e288xy1MiYOqZy6ojYxp+nY04BGRwTvsLUM8BztAx0ZOkdhDro6SfgThQXTeQb6Gi2OMHY5OQzqEJYWSM76TrHheSffp9QNhZUhadaO8OC97G4Aa4t90xDYqN6M6Mf58= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744365705; c=relaxed/simple; bh=W6/tialQBSeP2L8z+thsz051DDYF1BBYil0ZhJe1YFk=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=Xzmt9ToblsOKRn8ZRp5bt6/HmYEm5CVUiJHXmp22stackK1JhX1gRiST2WJ1wK9B3LTTyPWl8K2QvLukAwbb+YklEgsY3E+Eh+WxIBg3WVaKwXvE0zpmzfkS6ip7lJeEK8tx1DLgTWM4DaXPDXU5fnIiQ2nSwCo5v+sQMZZtzPA= 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=xABiIfyp; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=DS1CmdZt; 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="xABiIfyp"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="DS1CmdZt" Date: Fri, 11 Apr 2025 10:01:40 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1744365701; 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=3aaBsyQgVGrQpiInJRs+BVIKecvwR0LvyVfeahPAXKE=; b=xABiIfypAvFyu9w4mvHrfH3pb+XuJ9a+N6HOWU3HYIQotzrf02b9ZDS51+ajxYFoAPPKV0 laNLPgy5QG5W6uN9yUqXTy6WPKsPJzEdBMZTieQVQ3PC1Zq5MhXvVX1MFXGLyHxJBH80zt Ehb1OBHVSuht9Wqq69feKNvWxk4/f9mGth8oCmqkHl78CwI38qDkHKr6faDpQ4CyuOxPRu 9xILbuJGZcG7psshqgEY8XjHSnKG4tS8am8l7F/+tiMqtziuzzubm5OiN/c5Eary5B0GoJ 8+aD/G3UCE1lAVNp+xIxqHpBWb2LYXUQMYWU3z1PvWlSeczRApw49eDswDz1gw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1744365701; 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=3aaBsyQgVGrQpiInJRs+BVIKecvwR0LvyVfeahPAXKE=; b=DS1CmdZtxlFRletWF/qq3LKiRrI9lBcvt3ciDVG6nMgircerDOn9P2zQWw/R3MHdY0Zy2N ffjOKB6mvLVk9UBw== 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: Remove 'smp_text_poke_batch_flush()' 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-50-mingo@kernel.org> References: <20250411054105.2341982-50-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: <174436570022.31282.13431832769152830235.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: 2c373ca0640f25361aee1bcf382fc8081830938e Gitweb: https://git.kernel.org/tip/2c373ca0640f25361aee1bcf382fc8081= 830938e Author: Ingo Molnar AuthorDate: Fri, 11 Apr 2025 07:41:01 +02:00 Committer: Ingo Molnar CommitterDate: Fri, 11 Apr 2025 11:01:35 +02:00 x86/alternatives: Remove 'smp_text_poke_batch_flush()' It only has a single user left, merge it into smp_text_poke_batch_add() and remove the helper function. 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-50-mingo@kernel.org --- arch/x86/kernel/alternative.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index cd828c2..c0be066 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -2831,14 +2831,6 @@ void smp_text_poke_batch_finish(void) smp_text_poke_batch_process(); } =20 -static void smp_text_poke_batch_flush(void *addr) -{ - lockdep_assert_held(&text_mutex); - - if (text_poke_array.nr_entries =3D=3D TEXT_POKE_ARRAY_MAX || !text_poke_a= ddr_ordered(addr)) - smp_text_poke_batch_process(); -} - /** * smp_text_poke_batch_add() -- update instruction on live kernel on SMP, = batched * @addr: address to patch @@ -2854,7 +2846,8 @@ static void smp_text_poke_batch_flush(void *addr) */ void __ref smp_text_poke_batch_add(void *addr, const void *opcode, size_t = len, const void *emulate) { - smp_text_poke_batch_flush(addr); + if (text_poke_array.nr_entries =3D=3D TEXT_POKE_ARRAY_MAX || !text_poke_a= ddr_ordered(addr)) + smp_text_poke_batch_process(); __smp_text_poke_batch_add(addr, opcode, len, emulate); }