From nobody Sat Feb 7 14:52:32 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 368F435E533 for ; Tue, 27 Jan 2026 15:06:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769526368; cv=none; b=eyrd5XdwmLTpIO45aRWiOGv7vmnt5pim58y9kJLu53UHVYOJ8pcUtt4JAQHxAnHor925Tz9BQP2tytX4slDYblYuhFBDARbaCn6Kpsl0GvO4TC1voriYq1b4aq+bj3XPOgC6mIlPzcfahwQzkk7ONLfVaUA3iY0HoIdS6vAQp64= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769526368; c=relaxed/simple; bh=mfb7yxAPFt8DDPvfPmxwZDLUZvdFaVADsybCJ7EccOQ=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=Aii+eyQVJClDMgrY0xEVQRYXhkaVy3bMja5J47VOZ2q1BUjxxtWJtw+G/WZ2WLo07mQIsM0EMreKDGGnD1fiML8ILi7ADdFdYz873I/aynkxWoTudrlnRr4mWNf7LBlYo+SjlQiFN4v5oySBZikBKtqVZYmDfRsvctIXwDrEdqg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Gznk0b8A; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Gznk0b8A" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07024C19422; Tue, 27 Jan 2026 15:06:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769526368; bh=mfb7yxAPFt8DDPvfPmxwZDLUZvdFaVADsybCJ7EccOQ=; h=Date:From:To:Cc:Subject:References:From; b=Gznk0b8AdUEZO8d/hMRirh02JpBk7RJCm0BUm92WA5qmJbzJNrTA+eY5dTmzw19oX RuLpyoNkbO2l0BdUBRngAXxIoMYZxHTi2IzhqD88EFioySS3ApQjZvExywZ7HLuB2U +LL7bFcKisJ5KYsfFIBEGh0LcsHhxWw8GlNzYWQKKmNDNSDNDqvetQT7heVTlUbDQZ xTFiiW5gxWgQ9dJfmP5ZiBvgPYFIbPbsD6QBOqUmYjghn+23xoiBHUi647xY+kKsLp nm1o7U//cN/oXXiAMxtBO+J9SNI9q0JocEtyXna7JBKm5y8SrcHgGQkI0j3xqVTpnF TL56NyqTdLtLQ== Received: from rostedt by gandalf with local (Exim 4.99.1) (envelope-from ) id 1vkkdx-00000000LhX-3sf1; Tue, 27 Jan 2026 10:06:13 -0500 Message-ID: <20260127150613.780962226@kernel.org> User-Agent: quilt/0.68 Date: Tue, 27 Jan 2026 10:06:10 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Tom Zanussi Subject: [for-next][PATCH 15/15] tracing: Remove duplicate ENABLE_EVENT_STR and DISABLE_EVENT_STR macros References: <20260127150555.840066272@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Steven Rostedt The macros ENABLE_EVENT_STR and DISABLE_EVENT_STR were added to trace.h so that more than one file can have access to them, but was never removed from their original location. Remove the duplicates. Cc: Masami Hiramatsu Cc: Mathieu Desnoyers Cc: Tom Zanussi Link: https://patch.msgid.link/20260126130037.4ba201f9@gandalf.local.home Fixes: d0bad49bb0a09 ("tracing: Add enable_hist/disable_hist triggers") Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index f372a6374164..4972e1a2b5f3 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -4097,11 +4097,6 @@ void trace_put_event_file(struct trace_event_file *f= ile) EXPORT_SYMBOL_GPL(trace_put_event_file); =20 #ifdef CONFIG_DYNAMIC_FTRACE - -/* Avoid typos */ -#define ENABLE_EVENT_STR "enable_event" -#define DISABLE_EVENT_STR "disable_event" - struct event_probe_data { struct trace_event_file *file; unsigned long count; --=20 2.51.0