Commit-ID: f91fecc09e498529230b4d5053cb361619a0c42d
Gitweb: https://git.kernel.org/tip/f91fecc09e498529230b4d5053cb361619a0c42d
Author: Shaokun Zhang <zhangshaokun@xxxxxxxxxxxxx>
AuthorDate: Mon, 18 Feb 2019 21:05:01 +0800
Committer: Borislav Petkov <bp@xxxxxxx>
CommitDate: Mon, 18 Feb 2019 17:09:24 +0100
x86/smpboot: Remove unused phys_id variable
The 'phys_id' local variable became unused after commit
ce4b1b16502b ("x86/smpboot: Initialize secondary CPU only if master CPU will wait for it").
Remove it.
Signed-off-by: Shaokun Zhang <zhangshaokun@xxxxxxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Cc: Alison Schofield <alison.schofield@xxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Igor Mammedov <imammedo@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Cc: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx>
Cc: Pu Wen <puwen@xxxxxxxx>
Cc: Suravee Suthikulpanit <suravee.suthikulpanit@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: x86-ml <x86@xxxxxxxxxx>
Cc: Yazen Ghannam <yazen.ghannam@xxxxxxx>
Cc: Zhenzhong Duan <zhenzhong.duan@xxxxxxxxxx>
Link: https://lkml.kernel.org/r/1550495101-41755-1-git-send-email-zhangshaokun@xxxxxxxxxxxxx
---
arch/x86/kernel/smpboot.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index ccd1f2a8e557..5d5421b48e55 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -149,7 +149,7 @@ static inline void smpboot_restore_warm_reset_vector(void)
*/
static void smp_callin(void)
{
- int cpuid, phys_id;
+ int cpuid;
/*
* If waken up by an INIT in an 82489DX configuration
@@ -159,11 +159,6 @@ static void smp_callin(void)
*/
cpuid = smp_processor_id();
- /*
- * (This works even if the APIC is not enabled.)
- */
- phys_id = read_apic_id();
-
/*
* the boot CPU has finished the init stage and is spinning
* on callin_map until we finish. We are free to set up this
|