x86/ioapic: Replace some more set bit nonsense

Yet another set_bit() operation wrapped in oring a mask.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Michael Kelley <mhklinux@outlook.com>
Tested-by: Sohil Mehta <sohil.mehta@intel.com>
Link: https://lore.kernel.org/r/20240212154638.995080989@linutronix.de

diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
index 4b0f98a8d338d5c56371e4af161ae335cde7528a..9bf1e75c1defe466e9de03c008aa0a1e36efa8f4 100644 (file)
--- a/arch/x86/include/asm/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
@@ -86,9 +86,6 @@ typedef struct physid_mask physid_mask_t;
 #define physid_set(physid, map)                        set_bit(physid, (map).mask)
 #define physid_isset(physid, map)              test_bit(physid, (map).mask)
 
-#define physids_or(dst, src1, src2)                                    \
-       bitmap_or((dst).mask, (src1).mask, (src2).mask, MAX_LOCAL_APIC)
-
 #define physids_clear(map)                                     \
        bitmap_zero((map).mask, MAX_LOCAL_APIC)
 

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index e71745e7a0c5269acd601801bdb64660fc7ea894..b62c7ee0e6c58dce8a5f4a2dd93c7faaa5f83c2a 100644 (file)
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2494,9 +2494,8 @@ unsigned int arch_dynirq_lower_bound(unsigned int from)
 #ifdef CONFIG_X86_32
 static int io_apic_get_unique_id(int ioapic, int apic_id)
 {
-       union IO_APIC_reg_00 reg_00;
        static physid_mask_t apic_id_map = PHYSID_MASK_NONE;
-       physid_mask_t tmp;
+       union IO_APIC_reg_00 reg_00;
        unsigned long flags;
        int i = 0;
 
@@ -2542,8 +2541,7 @@ static int io_apic_get_unique_id(int ioapic, int apic_id)
                apic_id = i;
        }
 
-       physid_set_mask_of_physid(apic_id, &tmp);
-       physids_or(apic_id_map, apic_id_map, tmp);
+       physid_set(apic_id, apic_id_map);
 
        if (reg_00.bits.ID != apic_id) {
                reg_00.bits.ID = apic_id;