浏览代码

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
Dou Liyang 8 年之前
父节点
当前提交
e3cccbce14
共有 1 个文件被更改,包括 0 次插入4 次删除
  1. 0 4
      arch/x86/kernel/apic/apic.c

+ 0 - 4
arch/x86/kernel/apic/apic.c

@@ -211,11 +211,7 @@ 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
 }
 }
 
 
 /*
 /*