| commit | 9c803869f5f5e3d7ad94b2926474b2882e30073b | [log] [tgz] |
|---|---|---|
| author | Cyrill Gorcunov <gorcunov@gmail.com> | Sat Aug 16 23:21:54 2008 +0400 |
| committer | Ingo Molnar <mingo@elte.hu> | Sun Aug 17 14:41:50 2008 +0200 |
| tree | cdd80a3c161e0c4da171495e2c53780e7b8e9504 | |
| parent | 274cfe5912eebe9d4e1a4c451fe617289a181fcf [diff] [blame] |
x86: apic - unify lapic_is_integrated Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 9e8702e..41134d4 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c
@@ -128,7 +128,11 @@ */ static inline int lapic_is_integrated(void) { +#ifdef CONFIG_X86_64 + return 1; +#else return APIC_INTEGRATED(lapic_get_version()); +#endif } /*