Skip to content

Commit 6a4be69

Browse files
andyhhpKAGA-KOKO
authored andcommitted
x86/apic: Fix use of X{,2}APIC_ENABLE in asm with older binutils
"x86/smpboot: Support parallel startup of secondary CPUs" adds the first use of X2APIC_ENABLE in assembly, but older binutils don't tolerate the UL suffix. Switch to using BIT() instead. Fixes: 7e75178 ("x86/smpboot: Support parallel startup of secondary CPUs") Reported-by: Jeffrey Hugo <quic_jhugo@quicinc.com> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Tested-by: Jeffrey Hugo <quic_jhugo@quicinc.com> Link: https://lore.kernel.org/r/20230522105738.2378364-1-andrew.cooper3@citrix.com
1 parent 0c7ffa3 commit 6a4be69

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

arch/x86/include/asm/apicdef.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
#ifndef _ASM_X86_APICDEF_H
33
#define _ASM_X86_APICDEF_H
44

5+
#include <linux/bits.h>
6+
57
/*
68
* Constants for various Intel APICs. (local APIC, IOAPIC, etc.)
79
*
@@ -140,8 +142,8 @@
140142
#define APIC_BASE (fix_to_virt(FIX_APIC_BASE))
141143
#define APIC_BASE_MSR 0x800
142144
#define APIC_X2APIC_ID_MSR 0x802
143-
#define XAPIC_ENABLE (1UL << 11)
144-
#define X2APIC_ENABLE (1UL << 10)
145+
#define XAPIC_ENABLE BIT(11)
146+
#define X2APIC_ENABLE BIT(10)
145147

146148
#ifdef CONFIG_X86_32
147149
# define MAX_IO_APICS 64

0 commit comments

Comments
 (0)