mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 06:10:56 +00:00
x86: apic - unify lapic_is_integrated
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
274cfe5912
commit
9c803869f5
2 changed files with 9 additions and 1 deletions
|
@ -128,7 +128,11 @@ static inline int lapic_get_version(void)
|
||||||
*/
|
*/
|
||||||
static inline int lapic_is_integrated(void)
|
static inline int lapic_is_integrated(void)
|
||||||
{
|
{
|
||||||
|
#ifdef CONFIG_X86_64
|
||||||
|
return 1;
|
||||||
|
#else
|
||||||
return APIC_INTEGRATED(lapic_get_version());
|
return APIC_INTEGRATED(lapic_get_version());
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -111,11 +111,15 @@ static inline int lapic_get_version(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check, if the APIC is integrated or a seperate chip
|
* Check, if the APIC is integrated or a separate chip
|
||||||
*/
|
*/
|
||||||
static inline int lapic_is_integrated(void)
|
static inline int lapic_is_integrated(void)
|
||||||
{
|
{
|
||||||
|
#ifdef CONFIG_X86_64
|
||||||
return 1;
|
return 1;
|
||||||
|
#else
|
||||||
|
return APIC_INTEGRATED(lapic_get_version());
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue