Skip to contentSkip to conversation

x86/apic: Remove local var in flat_send_IPI_allbutself()

PATCH New Borislav Petkov 2 participants 2 messages Dec 11, 2017 – Dec 12, 2017 x86

lore
Share & tools
lore

Borislav Petkov

author maintainer
#0 lore raw

PATCH 1/1 x86/apic: Remove local var in flat_send_IPI_allbutself()

From: Borislav Petkov <[email protected]>

No code changed:

# arch/x86/kernel/apic/apic_flat_64.o:

   text    data     bss     dec     hex filename
   1838     624       0    2462     99e apic_flat_64.o.before
   1838     624       0    2462     99e apic_flat_64.o.after

md5:
aa2ae687d94bc4534f86ae6865dabd6a apic_flat_64.o.before.asm 42148da76ba8f9a236c33f8803bd2a6b apic_flat_64.o.after.asm

md5 sum is different due to asm output offsets changing.

Signed-off-by Borislav Petkov <[email protected]>
---
 arch/x86/kernel/apic/apic_flat_64.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
arch/x86/kernel/apic/apic_flat_64.c +2 -6
index aa85690e9b64..f58a49769bc6 100644
@@ -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];
Signature · 1 line
2.13.0
merge bot
#1 lore raw
x86/apic: Remove local var in flat_send_IPI_allbutself()
Commit-ID:  03dd604e1d515ca1ab02aaae12162e0a077858e9
Gitweb:     https://git.kernel.org/tip/03dd604e1d515ca1ab02aaae12162e0a077858e9
Author:     Borislav Petkov <[email protected]>
AuthorDate: Mon, 11 Dec 2017 12:54:44 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Mon, 11 Dec 2017 14:47:16 +0100

x86/apic: Remove local var in flat_send_IPI_allbutself()

No code changed:

# arch/x86/kernel/apic/apic_flat_64.o:

   text    data     bss     dec     hex filename
   1838     624       0    2462     99e apic_flat_64.o.before
   1838     624       0    2462     99e apic_flat_64.o.after

md5:
aa2ae687d94bc4534f86ae6865dabd6a apic_flat_64.o.before.asm 42148da76ba8f9a236c33f8803bd2a6b apic_flat_64.o.after.asm

md5 sum is different due to asm output offsets changing.

Signed-off-by Borislav Petkov <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>
---
 arch/x86/kernel/apic/apic_flat_64.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
arch/x86/kernel/apic/apic_flat_64.c +2 -6
index aa85690..f58a497 100644
@@ -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];