[PATCH 1/2] x86/apic: Remove duplicate judgement of X86_64 in lapic_is_integrated()

From	Dou Liyang <douly.fnst@cn.fujitsu.com>
Newsgroups	linux.kernel
Subject	[PATCH 1/2] x86/apic: Remove duplicate judgement of X86_64 in lapic_is_integrated()
Date	2017-09-07 10:50 +0200
Message-ID	<un0Fz-5YE-1@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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 <douly.fnst@cn.fujitsu.com>
---
 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/2] x86/apic: Remove duplicate judgement of X86_64 in lapic_is_integrated() Dou Liyang <douly.fnst@cn.fujitsu.com> - 2017-09-07 10:50 +0200
  [PATCH 2/2] x86/apic: Convert APIC_INTEGRATED to lapic_is_integrated() in apic.c Dou Liyang <douly.fnst@cn.fujitsu.com> - 2017-09-07 10:50 +0200

csiph-web