Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5289d300 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 apic cleanup from Ingo Molnar:
 "A single change simplifying the APIC code bit"

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic: Remove local var in flat_send_IPI_allbutself()
parents af8c5e2d 03dd604e

arch/x86/kernel/apic/apic_flat_64.c

+2 −6
Original line number Diff line number Diff line
@@ -85,12 +85,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];