From: Dou Liyang <douly.fnst@cn.fujitsu.com>
Date: Thu, 7 Sep 2017 08:49:20 +0000 (+0800)
Subject: x86/apic: Remove duplicate X86_64 conditional in lapic_is_integrated()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e3cccbce146fdc61e0f7ffc4cdda2b408b23cf3a;p=linux.git

x86/apic: Remove duplicate X86_64 conditional in lapic_is_integrated()

The macro APIC_INTEGRATED(x) is already wrapped by CONFIG_X86_32. So
it can be invoked unconditionally.

Remove the extra "#ifdef CONFIG_X86_64...". No functional change.

Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: bhe@redhat.com
Link: https://lkml.kernel.org/r/1504774161-7137-1-git-send-email-douly.fnst@cn.fujitsu.com
---

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index a4ee367069999..6708e25a09f5b 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
 }
 
 /*