x86, VisWS: turn into generic arch, update asm-x86/mach-visws/mach_apicdef.h
update asm-x86/mach-visws/mach_apicdef.h to the generic version. This should work fine as VISWS has a standard local APIC and thus its mach_apicdef.h copy is just an ancient version of the generic code. Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
6649ababd5
commit
b70d9c2473
1 changed files with 17 additions and 5 deletions
|
@ -1,12 +1,24 @@
|
|||
#ifndef __ASM_MACH_APICDEF_H
|
||||
#define __ASM_MACH_APICDEF_H
|
||||
|
||||
#define APIC_ID_MASK (0xF<<24)
|
||||
#include <asm/apic.h>
|
||||
|
||||
static inline unsigned get_apic_id(unsigned long x)
|
||||
#ifdef CONFIG_X86_64
|
||||
#define APIC_ID_MASK (0xFFu<<24)
|
||||
#define GET_APIC_ID(x) (((x)>>24)&0xFFu)
|
||||
#define SET_APIC_ID(x) (((x)<<24))
|
||||
#else
|
||||
#define APIC_ID_MASK (0xF<<24)
|
||||
static inline unsigned get_apic_id(unsigned long x)
|
||||
{
|
||||
return (((x)>>24)&0xF);
|
||||
}
|
||||
#define GET_APIC_ID(x) get_apic_id(x)
|
||||
unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR));
|
||||
if (APIC_XAPIC(ver))
|
||||
return (((x)>>24)&0xFF);
|
||||
else
|
||||
return (((x)>>24)&0xF);
|
||||
}
|
||||
|
||||
#define GET_APIC_ID(x) get_apic_id(x)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue