Skip to content

Commit f2208aa

Browse files
KAGA-KOKObp3tk0v
authored andcommitted
x86/mpparse: Register APIC address only once
The APIC address is registered twice. First during the early detection and afterwards when actually scanning the table for APIC IDs. The APIC and topology core warn about the second attempt. Restrict it to the early detection call. Fixes: 81287ad ("x86/apic: Sanitize APIC address setup") Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: Borislav Petkov (AMD) <[email protected]> Tested-by: Guenter Roeck <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 5e25eb2 commit f2208aa

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

arch/x86/kernel/mpparse.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,12 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
197197
if (!smp_check_mpc(mpc, oem, str))
198198
return 0;
199199

200-
/* Initialize the lapic mapping */
201-
if (!acpi_lapic)
202-
register_lapic_address(mpc->lapic);
203-
204-
if (early)
200+
if (early) {
201+
/* Initialize the lapic mapping */
202+
if (!acpi_lapic)
203+
register_lapic_address(mpc->lapic);
205204
return 1;
205+
}
206206

207207
/* Now process the configuration blocks. */
208208
while (count < mpc->length) {

0 commit comments

Comments
 (0)