hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Thomas Gleixner 2008-01-30 13:30:15 +01:00 committed by Ingo Molnar
parent 37e650c7c8
commit 3c6bb07ac1
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/apic_64.c
View File

@ -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;

11
arch/x86/kernel/smpboot_64.c
View File

@ -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");
}
}
}

2
include/asm-x86/apic_64.h
View File

@ -49,7 +49,7 @@ static __inline unsigned int apic_read(unsigned long reg)
}
extern void apic_wait_icr_idle(void);
extern unsigned int safe_apic_wait_icr_idle(void);
extern u32 safe_apic_wait_icr_idle(void);
static inline void ack_APIC_irq(void)
{