The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 0d847ce7c17613d63401ac82336ee1d5df749120 Gitweb: https://git.kernel.org/tip/0d847ce7c17613d63401ac82336ee1d5df749120 Author: Borislav Petkov <bp@xxxxxxx> AuthorDate: Wed, 21 Oct 2020 18:39:47 +02:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Wed, 28 Oct 2020 14:58:51 +01:00 x86/setup: Remove unused MCA variables Commit bb8187d35f82 ("MCA: delete all remaining traces of microchannel bus support.") removed the remaining traces of Micro Channel Architecture support but one trace remained - three variables in setup.c which have been unused since 2012 at least. Drop them finally. Signed-off-by: Borislav Petkov <bp@xxxxxxx> Link: https://lkml.kernel.org/r/20201021165614.23023-1-bp@xxxxxxxxx --- arch/x86/kernel/setup.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 84f581c..a23130c 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -119,11 +119,6 @@ EXPORT_SYMBOL(boot_cpu_data); unsigned int def_to_bigsmp; -/* For MCA, but anyone else can use it if they want */ -unsigned int machine_id; -unsigned int machine_submodel_id; -unsigned int BIOS_revision; - struct apm_info apm_info; EXPORT_SYMBOL(apm_info);