Commit-ID: e3cccbce146fdc61e0f7ffc4cdda2b408b23cf3a
Gitweb: http://git.kernel.org/tip/e3cccbce146fdc61e0f7ffc4cdda2b408b23cf3a
Author: Dou Liyang <douly.fnst@xxxxxxxxxxxxxx>
AuthorDate: Thu, 7 Sep 2017 16:49:20 +0800
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Mon, 25 Sep 2017 15:19:43 +0200
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@xxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: bhe@xxxxxxxxxx
Link: https://lkml.kernel.org/r/1504774161-7137-1-git-send-email-douly.fnst@xxxxxxxxxxxxxx
---
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 a4ee367..6708e25 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
}
/*
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|