Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 88782
b: refs/heads/master
c: ba10485
h: refs/heads/master
v: v3
  • Loading branch information
Glauber de Oliveira Costa authored and Ingo Molnar committed Apr 17, 2008
1 parent f52f620 commit ca71ec3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 26c6b5ea5575a5a4886dc45f889e7b783641f2de
refs/heads/master: ba10485c2f5a9482d93b095960cbe7d865d59e04
11 changes: 6 additions & 5 deletions trunk/arch/x86/kernel/smpboot_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -373,17 +373,18 @@ static inline void __inquire_remote_apic(int apicid)
int timeout;
u32 status;

printk("Inquiring remote APIC #%d...\n", apicid);
printk(KERN_INFO "Inquiring remote APIC #%d...\n", apicid);

for (i = 0; i < ARRAY_SIZE(regs); i++) {
printk("... APIC #%d %s: ", apicid, names[i]);
printk(KERN_INFO "... APIC #%d %s: ", apicid, names[i]);

/*
* Wait for idle.
*/
status = safe_apic_wait_icr_idle();
if (status)
printk("a previous APIC delivery may have failed\n");
printk(KERN_CONT
"a previous APIC delivery may have failed\n");

apic_write_around(APIC_ICR2, SET_APIC_DEST_FIELD(apicid));
apic_write_around(APIC_ICR, APIC_DM_REMRD | regs[i]);
Expand All @@ -397,10 +398,10 @@ static inline void __inquire_remote_apic(int apicid)
switch (status) {
case APIC_ICR_RR_VALID:
status = apic_read(APIC_RRR);
printk("%lx\n", status);
printk(KERN_CONT "%08x\n", status);
break;
default:
printk("failed\n");
printk(KERN_CONT "failed\n");
}
}
}
Expand Down

0 comments on commit ca71ec3

Please sign in to comment.