From nobody Tue Oct 7 14:05:32 2025 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 89B57247282 for ; Wed, 9 Jul 2025 20:27:25 +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=1752092847; cv=none; b=gfUhEUqjmdi914zqmwrHLJMGQPwfy9A3L9zK3JnncPQ+ly5/E+Xbd25oSksc2u+g1gDiQOF0jBoV5RuZlKMxVJCxmj58Lw9uG53bTW1fu/I2uBQecr1MgixiIo0JfG6i2Qj5fmni0a6j86KY0MuvAz6HsHQYu/O74MvlzjImt0E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752092847; c=relaxed/simple; bh=g+JKZAg/TiCH95nnSuM7T6vJeQVg+SeGa1eL3msI0Qs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MU/xtYktZjUrOjJ27ibqjntECZzseRt25QvQb23yfGmj6IphBrHBXQEJiH9O2Lpc8nrkHc39P73qINve4Kf7FFdKgVK2rbA2vSUYVqXlN3dnqo74cyitm0jAxseBdMo5H4ODUCw7MiHDe6iXy9fCCyla+FO0S7ohWTg+z2U8Uhk= 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=Vhq/dzZP; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Sx7EL1K5; 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="Vhq/dzZP"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Sx7EL1K5" From: "Ahmed S. Darwish" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1752092843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pCZbBJqJSjCot6gOqD2i4qsn8fO/mwHQL/oAFr+hIVY=; b=Vhq/dzZPUTwrMuoJdMTkIRRPwIyZo68WYk09Y6atqYaq145amKqRPs78RUekanBfTFPrZL YETy5ljDwsIRKrITLSzQCp/qnfjB44sscJVxT+LN92NLctPlte9z3bmhCVT4RWls77hHOJ V1KXXjEg22Sg7azAfPefrnmO1BbtnEdffewkvmhVSvEOdHbEbQh8wWMiJcyix4BEQ6mdJS BiG9fS+9P+x8moh3YNORHaGEEeQ8KpfRjopoHshc9Q8xzfbb4S6viUxsVwX9M0h0k3gKlT 8CXdCimY8vTfk6ZyGbhq6xEPxecCVpjNIt2dz5y0nhFObt1hC0rEruAY5WBkWA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1752092843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pCZbBJqJSjCot6gOqD2i4qsn8fO/mwHQL/oAFr+hIVY=; b=Sx7EL1K5zxjZQWOpG9n2SjUehmWU9UKSlmgqCI0FMGTn5hSCqDNMMJr6TeCGztmDxeQa75 2skCYMMXdEmRqNCA== To: Borislav Petkov , Ingo Molnar , Dave Hansen Cc: Thomas Gleixner , Andrew Cooper , John Ogness , x86@kernel.org, x86-cpuid@lists.linux.dev, LKML , "Ahmed S. Darwish" Subject: [PATCH v2 3/6] x86: Reorder headers alphabetically Date: Wed, 9 Jul 2025 22:26:30 +0200 Message-ID: <20250709202635.89791-4-darwi@linutronix.de> In-Reply-To: <20250709202635.89791-1-darwi@linutronix.de> References: <20250612234010.572636-1-darwi@linutronix.de> <20250709202635.89791-1-darwi@linutronix.de> 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" Multiple x86 source files use the cpuid_*() macros, but implicitly include the main CPUID API header through instead. Sort their include lines so that can be explicitly included next. Signed-off-by: Ahmed S. Darwish --- arch/x86/boot/startup/sme.c | 8 ++-- arch/x86/coco/tdx/tdx.c | 5 ++- arch/x86/events/amd/uncore.c | 14 +++--- arch/x86/events/zhaoxin/core.c | 11 +++-- arch/x86/kernel/cpu/amd.c | 25 +++++------ arch/x86/kernel/cpu/mce/core.c | 62 +++++++++++++-------------- arch/x86/kernel/cpu/microcode/core.c | 22 +++++----- arch/x86/kernel/cpu/microcode/intel.c | 11 ++--- arch/x86/kernel/cpu/mshyperv.c | 28 ++++++------ arch/x86/kernel/cpu/resctrl/core.c | 5 ++- arch/x86/kernel/cpu/scattered.c | 2 +- arch/x86/kernel/cpu/topology_common.c | 2 +- arch/x86/kernel/paravirt.c | 28 ++++++------ 13 files changed, 114 insertions(+), 109 deletions(-) diff --git a/arch/x86/boot/startup/sme.c b/arch/x86/boot/startup/sme.c index 70ea1748c0a7..922b236be02f 100644 --- a/arch/x86/boot/startup/sme.c +++ b/arch/x86/boot/startup/sme.c @@ -34,15 +34,15 @@ */ #define USE_EARLY_PGTABLE_L5 =20 +#include #include -#include #include -#include +#include =20 +#include #include -#include #include -#include +#include #include =20 #define PGD_FLAGS _KERNPG_TABLE_NOENC diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c index 7b2833705d47..7bc11836c46a 100644 --- a/arch/x86/coco/tdx/tdx.c +++ b/arch/x86/coco/tdx/tdx.c @@ -8,16 +8,17 @@ #include #include #include + #include -#include -#include #include #include #include #include #include #include +#include #include +#include =20 /* MMIO direction */ #define EPT_READ 0 diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c index e8b6af199c73..c1483ef16c0b 100644 --- a/arch/x86/events/amd/uncore.c +++ b/arch/x86/events/amd/uncore.c @@ -5,18 +5,18 @@ * Author: Jacob Shin */ =20 -#include -#include -#include -#include -#include #include -#include #include +#include +#include +#include +#include +#include #include +#include =20 -#include #include +#include =20 #define NUM_COUNTERS_NB 4 #define NUM_COUNTERS_L2 4 diff --git a/arch/x86/events/zhaoxin/core.c b/arch/x86/events/zhaoxin/core.c index 4bdfcf091200..d59992364880 100644 --- a/arch/x86/events/zhaoxin/core.c +++ b/arch/x86/events/zhaoxin/core.c @@ -5,16 +5,16 @@ =20 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt =20 -#include -#include -#include -#include #include +#include #include +#include +#include +#include =20 +#include #include #include -#include #include =20 #include "../perf_event.h" @@ -616,4 +616,3 @@ __init int zhaoxin_pmu_init(void) =20 return 0; } - diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 655f44f89ded..6e2ee9ed76d2 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -1,32 +1,33 @@ // SPDX-License-Identifier: GPL-2.0-only -#include + #include #include -#include - +#include #include +#include +#include +#include #include #include -#include #include -#include -#include + #include #include #include #include -#include -#include +#include +#include +#include #include #include -#include -#include +#include #include -#include #include +#include +#include =20 #ifdef CONFIG_X86_64 -# include +#include #endif =20 #include "cpu.h" diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 4da4eab56c81..5a11c522ea97 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -9,52 +9,52 @@ * Author: Andi Kleen */ =20 -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include #include -#include +#include +#include +#include #include -#include +#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include #include +#include +#include +#include #include +#include +#include #include -#include -#include +#include +#include +#include =20 -#include #include -#include -#include -#include +#include #include #include +#include #include #include +#include +#include =20 #include "internal.h" =20 diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/mic= rocode/core.c index fe50eb5b7c4a..9243ed3ded85 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -17,27 +17,27 @@ =20 #define pr_fmt(fmt) "microcode: " fmt =20 -#include -#include -#include -#include #include -#include +#include #include -#include #include -#include -#include -#include +#include #include +#include +#include #include +#include +#include +#include +#include +#include =20 #include +#include #include +#include #include #include -#include -#include #include =20 #include "internal.h" diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/mi= crocode/intel.c index 371ca6eac00e..99fda8f7dba7 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -11,21 +11,22 @@ * H Peter Anvin" */ #define pr_fmt(fmt) "microcode: " fmt + +#include #include #include -#include #include #include +#include #include -#include +#include #include -#include =20 #include +#include #include -#include #include -#include +#include =20 #include "internal.h" =20 diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c index c78f860419d6..d0491bba9e30 100644 --- a/arch/x86/kernel/cpu/mshyperv.c +++ b/arch/x86/kernel/cpu/mshyperv.c @@ -6,33 +6,35 @@ * Author : K. Y. Srinivasan */ =20 -#include -#include #include -#include +#include #include #include -#include +#include #include #include #include #include -#include -#include +#include +#include + +#include #include -#include + +#include #include +#include +#include #include #include -#include -#include -#include -#include -#include -#include +#include #include +#include #include +#include +#include #include +#include =20 /* Is Linux running on nested Microsoft Hypervisor */ bool hv_nested; diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resct= rl/core.c index 187d527ef73b..35285567beec 100644 --- a/arch/x86/kernel/cpu/resctrl/core.c +++ b/arch/x86/kernel/cpu/resctrl/core.c @@ -17,13 +17,14 @@ #define pr_fmt(fmt) "resctrl: " fmt =20 #include -#include -#include #include +#include +#include =20 #include #include #include + #include "internal.h" =20 /* diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattere= d.c index dbf6d71bdf18..3d23b943f596 100644 --- a/arch/x86/kernel/cpu/scattered.c +++ b/arch/x86/kernel/cpu/scattered.c @@ -4,8 +4,8 @@ */ #include =20 -#include #include +#include #include =20 #include "cpu.h" diff --git a/arch/x86/kernel/cpu/topology_common.c b/arch/x86/kernel/cpu/to= pology_common.c index b5a5e1411469..48c47d02d8a9 100644 --- a/arch/x86/kernel/cpu/topology_common.c +++ b/arch/x86/kernel/cpu/topology_common.c @@ -3,8 +3,8 @@ =20 #include =20 -#include #include +#include #include #include =20 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index ab3e172dcc69..3d745cd25a43 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -6,34 +6,34 @@ 2007 - x86_64 support added by Glauber de Oliveira Costa, Red Hat Inc */ =20 +#include +#include #include -#include #include -#include -#include #include +#include #include #include #include =20 +#include #include -#include #include +#include #include +#include +#include +#include +#include +#include +#include +#include #include +#include #include -#include -#include -#include -#include -#include -#include #include -#include #include -#include -#include -#include +#include =20 /* stub always returning 0. */ DEFINE_ASM_FUNC(paravirt_ret0, "xor %eax,%eax", .entry.text); --=20 2.49.0