diff options
| author | Thomas Gleixner | 2008-01-30 13:30:15 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2008-01-30 13:30:15 +0100 |
| commit | 3c6bb07ac1b4174318606a26f0de8ceb9f6d8133 (patch) | |
| tree | 957316f296a4a3f90abd4a970b1babce8eb55f52 /arch/x86 | |
| parent | x86: rename get_maxlvt to lapic_get_maxlvt (diff) | |
| download | kernel-qcow2-linux-3c6bb07ac1b4174318606a26f0de8ceb9f6d8133.tar.gz kernel-qcow2-linux-3c6bb07ac1b4174318606a26f0de8ceb9f6d8133.tar.xz kernel-qcow2-linux-3c6bb07ac1b4174318606a26f0de8ceb9f6d8133.zip | |
x86: use u32 for safe_apic_wait_icr_idle()
Preperatory patch for merging apic headers.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/apic_64.c | 4 | ||||
| -rw-r--r-- | arch/x86/kernel/smpboot_64.c | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index dfeda91fa80c..3de3764a862c 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c @@ -135,9 +135,9 @@ void apic_wait_icr_idle(void) cpu_relax(); } -unsigned int safe_apic_wait_icr_idle(void) +u32 safe_apic_wait_icr_idle(void) { - unsigned int send_status; + u32 send_status; int timeout; timeout = 0; diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c index 8147b7d4db63..b36d32ff0b39 100644 --- a/arch/x86/kernel/smpboot_64.c +++ b/arch/x86/kernel/smpboot_64.c @@ -384,19 +384,20 @@ static void inquire_remote_apic(int apicid) unsigned i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 }; char *names[] = { "ID", "VERSION", "SPIV" }; int timeout; - unsigned int status; + u32 status; 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(APIC_ICR2, SET_APIC_DEST_FIELD(apicid)); apic_write(APIC_ICR, APIC_DM_REMRD | regs[i]); @@ -410,10 +411,10 @@ static void inquire_remote_apic(int apicid) switch (status) { case APIC_ICR_RR_VALID: status = apic_read(APIC_RRR); - printk("%08x\n", status); + printk(KERN_CONT "%08x\n", status); break; default: - printk("failed\n"); + printk(KERN_CONT "failed\n"); } } } |