The macro APIC_INTEGRATED(x) has already wrapped by CONFIG_X86_32. So Invoke it directly.
But lapic_is_integrated() invokes APIC_INTEGRATED(x) with the duplicate judgement of X86_64. Remove the "#ifdef CONFIG_X86_64...". No functionality change. Signed-off-by: Dou Liyang <[email protected]> --- arch/x86/kernel/apic/apic.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 7834f73..63b3ae9 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -211,11 +211,7 @@ 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 } /* -- 2.5.5
