Commit 9c803869 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: apic - unify lapic_is_integrated 



Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 274cfe59

arch/x86/kernel/apic_32.c

+4 −0
Original line number Diff line number Diff line
@@ -128,7 +128,11 @@ static inline int lapic_get_version(void) 
 */

static inline int lapic_is_integrated(void)

{

#ifdef CONFIG_X86_64

	return 1;

#else

	return APIC_INTEGRATED(lapic_get_version());

#endif

}



/*

arch/x86/kernel/apic_64.c

+5 −1
Original line number Diff line number Diff line
@@ -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)

{

#ifdef CONFIG_X86_64

	return 1;

#else

	return APIC_INTEGRATED(lapic_get_version());

#endif

}



/*