OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b371ae0
)
x86/apic: Remove duplicate X86_64 conditional in lapic_is_integrated()
author
Dou Liyang
<douly.fnst@cn.fujitsu.com>
Thu, 7 Sep 2017 08:49:20 +0000
(16:49 +0800)
committer
Thomas Gleixner
<tglx@linutronix.de>
Mon, 25 Sep 2017 13:19:43 +0000
(15:19 +0200)
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
arch/x86/kernel/apic/apic.c
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/apic/apic.c
b/arch/x86/kernel/apic/apic.c
index
a4ee367
..
6708e25
100644
(file)
--- 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
}
/*