git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
x86: apic - unify lapic_is_integrated
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
apic_32.c
diff --git
a/arch/x86/kernel/apic_32.c
b/arch/x86/kernel/apic_32.c
index
9e8702e
..
41134d4
100644
(file)
--- a/
arch/x86/kernel/apic_32.c
+++ b/
arch/x86/kernel/apic_32.c
@@
-128,7
+128,11
@@
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
}
/*