diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-02-10 13:16:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-02-10 13:16:09 -0800 |
| commit | 3516cadc70a742ab2a08b17d3176d242945bd12d (patch) | |
| tree | 2218bc889d353359ffe3b9b4cd432f2d5f32630e /arch | |
| parent | 5668a64622cf238ea954ea71cf2bed60967dba16 (diff) | |
| parent | 9bad74127f0ae8eeed2510fe381b064e08e6507e (diff) | |
| download | linux-next-3516cadc70a742ab2a08b17d3176d242945bd12d.tar.gz linux-next-3516cadc70a742ab2a08b17d3176d242945bd12d.zip | |
Merge tag 'x86-apic-2026-02-09' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 APIC update from Ingo Molnar:
- Inline __x2apic_send_IPI_dest() (Eric Dumazet)
* tag 'x86-apic-2026-02-09' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/apic: Inline __x2apic_send_IPI_dest()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/apic/local.h | 10 | ||||
| -rw-r--r-- | arch/x86/kernel/apic/x2apic_phys.c | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/arch/x86/kernel/apic/local.h b/arch/x86/kernel/apic/local.h index bdcf609eb283..998efd442063 100644 --- a/arch/x86/kernel/apic/local.h +++ b/arch/x86/kernel/apic/local.h @@ -14,7 +14,6 @@ #include <asm/apic.h> /* X2APIC */ -void __x2apic_send_IPI_dest(unsigned int apicid, int vector, unsigned int dest); u32 x2apic_get_apic_id(u32 id); void x2apic_send_IPI_all(int vector); @@ -42,6 +41,15 @@ static inline unsigned int __prepare_ICR(unsigned int shortcut, int vector, return icr; } +#ifdef CONFIG_X86_X2APIC +static inline void __x2apic_send_IPI_dest(unsigned int apicid, int vector, unsigned int dest) +{ + unsigned long cfg = __prepare_ICR(0, vector, dest); + + native_x2apic_icr_write(cfg, apicid); +} +#endif + void default_init_apic_ldr(void); void apic_mem_wait_icr_idle(void); diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c index 12d4c35547a6..10f79026e8e3 100644 --- a/arch/x86/kernel/apic/x2apic_phys.c +++ b/arch/x86/kernel/apic/x2apic_phys.c @@ -107,12 +107,6 @@ void x2apic_send_IPI_self(int vector) apic_write(APIC_SELF_IPI, vector); } -void __x2apic_send_IPI_dest(unsigned int apicid, int vector, unsigned int dest) -{ - unsigned long cfg = __prepare_ICR(0, vector, dest); - native_x2apic_icr_write(cfg, apicid); -} - static int x2apic_phys_probe(void) { if (!x2apic_mode) |