From nobody Fri Oct 2 06:18:28 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 5F8B0395240; Tue, 4 Aug 2026 17:58:12 +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=1785866294; cv=none; b=Mhr+CzekdetDz6XAIah/awBNWmfqyr1Ia35FM9AfNPzvtwXD1vfGVcY71/7427ldrsD59pcUUkOjmpd6ODcE+JN2+RtYbGvA0mkxQLK7E1XTq5fbNsJsLsR12ehNv/fLbY8S4ZCbiKC/q9ckdsRezV4nO69MRW1b+qqM/R+RcJA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785866294; c=relaxed/simple; bh=1ONxcfAusy9BdSxJbxuSymDGlUA+IYl3AmsP80C8kEo=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=hDSEINeHCz0T6xOC6a+ttCh78nhpdAmlUtxeOd+FD9JcHlfKLtZxhleGxh1DxgfkfHGo9PLSPk/1hGqnPkajiW5NnDvQrmYybBWRkt/t2OcOMByJK/os3n3NSVHPD8kmytk2xikKXZ0LNnYBvYrCohUeKA5bsimB2uolS2uOfPc= 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=xcbz1U/m; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=KgiHwqGS; 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="xcbz1U/m"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="KgiHwqGS" Date: Tue, 04 Aug 2026 17:58:09 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1785866290; 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=TIX0JHQmhT5Xk6so+jQWEW3GQxG5laatxsfOMmfo/sU=; b=xcbz1U/mbcjCiXBSaVpzL4dHDPJCCOAM+A+tdzrZGxE6RDhAsSDFcntRMVK32VFFEqyjrO ncNOTdnkfEpC8A7NXnsba2kUB7vMpqK/yN5lplF8FVjbtLp8Sy/3bF/8qf8RfvnkD17PrI kr+ugLDAiKWjlJCDjgDBTNqP5UP71fuLhogecPKA+i8u16Vfbig6cHmS2jiW9bxFwnaGbz taOCVFyAsKvVzHornRRZjguRyvZPSrk8raz4O4Cme+92A4PnkQeN0B01j0LctT7U5UCL04 irKjYKL69B8I589C0Jp1CDn6Bt6AyCKCIuQesjikeBQkqGF9oR7mw1TWO2L/NA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1785866290; 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=TIX0JHQmhT5Xk6so+jQWEW3GQxG5laatxsfOMmfo/sU=; b=KgiHwqGSrHoyewOQesrJsne8s4/czeXW6we5k7leMLFf+cr04IiTW/v/+96ZjMAhDDJ4t6 eIRB3teqS3T9voAQ== From: "tip-bot2 for Thorsten Blum" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/boot] x86/boot: Use IS_ENABLED() to simplify built-in-or-module checks Cc: Thorsten Blum , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260804115227.62158-4-thorsten.blum@linux.dev> References: <20260804115227.62158-4-thorsten.blum@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178586628900.1210945.8255441025572980386.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/boot branch of tip: Commit-ID: 2ea3973d4f8483a9654e1e0e2c648f78ca527011 Gitweb: https://git.kernel.org/tip/2ea3973d4f8483a9654e1e0e2c648f78c= a527011 Author: Thorsten Blum AuthorDate: Tue, 04 Aug 2026 13:52:25 +02:00 Committer: Ingo Molnar CommitterDate: Tue, 04 Aug 2026 19:45:55 +02:00 x86/boot: Use IS_ENABLED() to simplify built-in-or-module checks Replace open-coded built-in-or-module checks for CONFIG_APM, CONFIG_EDD, and CONFIG_X86_SPEEDSTEP_SMI with IS_ENABLED(). No change in functionality intended. Signed-off-by: Thorsten Blum Signed-off-by: Ingo Molnar Link: https://patch.msgid.link/20260804115227.62158-4-thorsten.blum@linux.d= ev --- arch/x86/boot/edd.c | 2 +- arch/x86/boot/main.c | 10 ++++------ arch/x86/kernel/setup.c | 5 ++--- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/arch/x86/boot/edd.c b/arch/x86/boot/edd.c index 1fb4bc7..97cad16 100644 --- a/arch/x86/boot/edd.c +++ b/arch/x86/boot/edd.c @@ -15,7 +15,7 @@ #include #include "string.h" =20 -#if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE) +#if IS_ENABLED(CONFIG_EDD) =20 /* * Read the MBR (first sector) from a specific device. diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c index 9d0fea1..4e382d9 100644 --- a/arch/x86/boot/main.c +++ b/arch/x86/boot/main.c @@ -164,14 +164,12 @@ void main(void) query_ist(); =20 /* Query APM information */ -#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) - query_apm_bios(); -#endif + if (IS_ENABLED(CONFIG_APM)) + query_apm_bios(); =20 /* Query EDD information */ -#if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE) - query_edd(); -#endif + if (IS_ENABLED(CONFIG_EDD)) + query_edd(); =20 /* Set the video mode */ set_video(); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 46882ce..fca42b1 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -120,8 +120,7 @@ struct cpuinfo_x86 new_cpu_data; struct apm_info apm_info; EXPORT_SYMBOL(apm_info); =20 -#if defined(CONFIG_X86_SPEEDSTEP_SMI) || \ - defined(CONFIG_X86_SPEEDSTEP_SMI_MODULE) +#if IS_ENABLED(CONFIG_X86_SPEEDSTEP_SMI) struct ist_info ist_info; EXPORT_SYMBOL(ist_info); #else @@ -230,7 +229,7 @@ char builtin_cmdline[COMMAND_LINE_SIZE] =3D CONFIG_CMDL= INE; bool builtin_cmdline_added __ro_after_init; #endif =20 -#if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE) +#if IS_ENABLED(CONFIG_EDD) struct edd edd; #ifdef CONFIG_EDD_MODULE EXPORT_SYMBOL(edd);