Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 18 Feb 2019 08:34:12 -0800
From:   tip-bot for Shaokun Zhang <tipbot@zytor.com>
Message-ID: <tip-f91fecc09e498529230b4d5053cb361619a0c42d@git.kernel.org>
Cc:     imammedo@redhat.com, tglx@linutronix.de, puwen@hygon.cn,
        x86@kernel.org, suravee.suthikulpanit@amd.com, bp@suse.de,
        mingo@redhat.com, zhenzhong.duan@oracle.com, mingo@kernel.org,
        yazen.ghannam@amd.com, linux-kernel@vger.kernel.org,
        zhangshaokun@hisilicon.com, konrad.wilk@oracle.com,
        rppt@linux.vnet.ibm.com, hpa@zytor.com, alison.schofield@intel.com
Reply-To: alison.schofield@intel.com, hpa@zytor.com,
          konrad.wilk@oracle.com, rppt@linux.vnet.ibm.com,
          mingo@kernel.org, zhangshaokun@hisilicon.com,
          yazen.ghannam@amd.com, linux-kernel@vger.kernel.org,
          mingo@redhat.com, zhenzhong.duan@oracle.com, bp@suse.de,
          suravee.suthikulpanit@amd.com, x86@kernel.org,
          imammedo@redhat.com, puwen@hygon.cn, tglx@linutronix.de
In-Reply-To: <1550495101-41755-1-git-send-email-zhangshaokun@hisilicon.com>
References: <1550495101-41755-1-git-send-email-zhangshaokun@hisilicon.com>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:x86/cleanups] x86/smpboot: Remove unused phys_id variable
Git-Commit-ID: f91fecc09e498529230b4d5053cb361619a0c42d
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  f91fecc09e498529230b4d5053cb361619a0c42d
Gitweb:     https://git.kernel.org/tip/f91fecc09e498529230b4d5053cb361619a0c42d
Author:     Shaokun Zhang <zhangshaokun@hisilicon.com>
AuthorDate: Mon, 18 Feb 2019 21:05:01 +0800
Committer:  Borislav Petkov <bp@suse.de>
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@hisilicon.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Alison Schofield <alison.schofield@intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Cc: Pu Wen <puwen@hygon.cn>
Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Cc: Yazen Ghannam <yazen.ghannam@amd.com>
Cc: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Link: https://lkml.kernel.org/r/1550495101-41755-1-git-send-email-zhangshaokun@hisilicon.com
---
 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