From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751709AbeA2LOa (ORCPT ); Mon, 29 Jan 2018 06:14:30 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:51449 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751349AbeA2LO2 (ORCPT ); Mon, 29 Jan 2018 06:14:28 -0500 X-Google-Smtp-Source: AH8x226MOfH9+q25BVm5yNGQaJOfGjC5s6+P3S+zZtZoWD8fPSzhZ9Em3O9OudnJZtA8TeMz+bnhZQ== Date: Mon, 29 Jan 2018 12:14:25 +0100 From: Ingo Molnar To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, Thomas Gleixner , Peter Zijlstra , Andrew Morton Subject: [GIT PULL] x86/apic change for v4.16 Message-ID: <20180129111425.fts3hdryr6r2srtr@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: NeoMutt/20170609 (1.8.3) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linus, Please pull the latest x86-apic-for-linus git tree from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-apic-for-linus # HEAD: 03dd604e1d515ca1ab02aaae12162e0a077858e9 x86/apic: Remove local var in flat_send_IPI_allbutself() A single change simplifying the APIC code bit. Thanks, Ingo ------------------> Borislav Petkov (1): x86/apic: Remove local var in flat_send_IPI_allbutself() arch/x86/kernel/apic/apic_flat_64.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c index aa85690e9b64..f58a49769bc6 100644 --- a/arch/x86/kernel/apic/apic_flat_64.c +++ b/arch/x86/kernel/apic/apic_flat_64.c @@ -84,12 +84,8 @@ flat_send_IPI_mask_allbutself(const struct cpumask *cpumask, int vector) static void flat_send_IPI_allbutself(int vector) { int cpu = smp_processor_id(); -#ifdef CONFIG_HOTPLUG_CPU - int hotplug = 1; -#else - int hotplug = 0; -#endif - if (hotplug || vector == NMI_VECTOR) { + + if (IS_ENABLED(CONFIG_HOTPLUG_CPU) || vector == NMI_VECTOR) { if (!cpumask_equal(cpu_online_mask, cpumask_of(cpu))) { unsigned long mask = cpumask_bits(cpu_online_mask)[0];