diff options
| author |   Dou Liyang <douly.fnst@cn.fujitsu.com> | 2017-09-07 16:49:20 +0800 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2017-09-25 15:19:43 +0200 |
| commit | e3cccbce146fdc61e0f7ffc4cdda2b408b23cf3a (patch) | |
| tree | 49ffed0111406a4927434d4701e40d80074fad35 /arch/x86/kernel/apic/apic.c | |
| parent | x86/apic: Remove init_bsp_APIC() (diff) | |
| download | linux-dev-e3cccbce146fdc61e0f7ffc4cdda2b408b23cf3a.tar.xz linux-dev-e3cccbce146fdc61e0f7ffc4cdda2b408b23cf3a.zip | |
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
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
| -rw-r--r-- | arch/x86/kernel/apic/apic.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index a4ee36706999..6708e25a09f5 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 } /* |