From mboxrd@z Thu Jan 1 00:00:00 1970 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 D03A822CBFC; Mon, 3 Mar 2025 16:31:47 +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=1741019507; cv=none; b=J+E3IaZuHFC8srFJ+rOkW4Wcp5wqYP8+6G85t2yvMtuZ8jPzrSzbWPUcIxR1v4Z4GAINpk16wg5ioNOReb215HfF5GQvw8Hw10w9i/7pZj+i0UY3BZck+Hdvkb5gebBbWG2CVhXKpkV1UvDtRnMxxp8MSAgTpDc8TktegLVBqfM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741019507; c=relaxed/simple; bh=Gf4L9Kb1Z9un25PwqurLSNnkgPyzqTlm1uCTOa5d+Ps=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kdDn1eFGLGNfBsReYXmNwpaT0b+hwQsxM26evN1Zw/3a3iI0QLcrV6cAnRHPbaS+wezlJo1EyoShW0SBWVdnxQp2R0um5E1MNq7T4Yu+LioU8C8d3y9zifMUsT9MUjvMr+WxqfpvxqnavXDGyhS133PoNvaJqB7RCmZOGDkiiLY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LMHT+BX2; 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="LMHT+BX2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 183C0C4CEE6; Mon, 3 Mar 2025 16:31:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741019507; bh=Gf4L9Kb1Z9un25PwqurLSNnkgPyzqTlm1uCTOa5d+Ps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LMHT+BX22amj1WRw0w1PjWEcBl8cJlSftIPvm5iLYDOMmeQTEyD1ia/Br9doljzNH vBbZNWBVC8W7kWq0Iyft8e9iqbFilqV4x2AiJm98AUMU+c5xw5eQcfIp71ZUS9pJZ8 yq/AqZ9UICSG0SHqZ0xBeWXy3VTVXJ5m/B5ADTgs7ueUWfDJnOREr+g2p6a2uT4hXb d6O/0dQI2ftLVxbtFEzCE5JpQaBzQpK6qQydSkZtIJC2q3hDf6Sy/78Ag94ONwaW5l MCaCN1HLih9N8r28pLKkyS6FVjXhdA2BEnXaUSe6DSiS42x7U6OpOa3wPlId7wd99U Oz4hIyzSfzk6A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Arnd Bergmann , Ingo Molnar , Sasha Levin , tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, jacob.jun.pan@linux.intel.com Subject: [PATCH AUTOSEL 6.1 6/9] x86/irq: Define trace events conditionally Date: Mon, 3 Mar 2025 11:31:30 -0500 Message-Id: <20250303163133.3764032-6-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250303163133.3764032-1-sashal@kernel.org> References: <20250303163133.3764032-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.129 Content-Transfer-Encoding: 8bit From: Arnd Bergmann [ Upstream commit 9de7695925d5d2d2085681ba935857246eb2817d ] When both of X86_LOCAL_APIC and X86_THERMAL_VECTOR are disabled, the irq tracing produces a W=1 build warning for the tracing definitions: In file included from include/trace/trace_events.h:27, from include/trace/define_trace.h:113, from arch/x86/include/asm/trace/irq_vectors.h:383, from arch/x86/kernel/irq.c:29: include/trace/stages/init.h:2:23: error: 'str__irq_vectors__trace_system_name' defined but not used [-Werror=unused-const-variable=] Make the tracepoints conditional on the same symbosl that guard their usage. Signed-off-by: Arnd Bergmann Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20250225213236.3141752-1-arnd@kernel.org Signed-off-by: Sasha Levin --- arch/x86/kernel/irq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 766ffe3ba3137..439fdb3f5fdf1 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -23,8 +23,10 @@ #include #include +#if defined(CONFIG_X86_LOCAL_APIC) || defined(CONFIG_X86_THERMAL_VECTOR) #define CREATE_TRACE_POINTS #include +#endif DEFINE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat); EXPORT_PER_CPU_SYMBOL(irq_stat); -- 2.39.5