aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic/apic.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
-rw-r--r--arch/x86/kernel/apic/apic.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 850657d1b0ed..cb1304856a5c 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -433,17 +433,18 @@ int setup_APIC_eilvt(u8 offset, u8 vector, u8 msg_type, u8 mask)
433 reserved = reserve_eilvt_offset(offset, new); 433 reserved = reserve_eilvt_offset(offset, new);
434 434
435 if (reserved != new) { 435 if (reserved != new) {
436 pr_err(FW_BUG "cpu %d, try to setup vector 0x%x, but " 436 pr_err(FW_BUG "cpu %d, try to use APIC%lX (LVT offset %d) for "
437 "vector 0x%x was already reserved by another core, " 437 "vector 0x%x, but the register is already in use for "
438 "APIC%lX=0x%x\n", 438 "vector 0x%x on another cpu\n",
439 smp_processor_id(), new, reserved, reg, old); 439 smp_processor_id(), reg, offset, new, reserved);
440 return -EINVAL; 440 return -EINVAL;
441 } 441 }
442 442
443 if (!eilvt_entry_is_changeable(old, new)) { 443 if (!eilvt_entry_is_changeable(old, new)) {
444 pr_err(FW_BUG "cpu %d, try to setup vector 0x%x but " 444 pr_err(FW_BUG "cpu %d, try to use APIC%lX (LVT offset %d) for "
445 "register already in use, APIC%lX=0x%x\n", 445 "vector 0x%x, but the register is already in use for "
446 smp_processor_id(), new, reg, old); 446 "vector 0x%x on this cpu\n",
447 smp_processor_id(), reg, offset, new, old);
447 return -EBUSY; 448 return -EBUSY;
448 } 449 }
449 450