diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-08-16 23:21:54 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-17 16:41:50 +0400 |
| commit | 9c803869f5f5e3d7ad94b2926474b2882e30073b (patch) | |
| tree | cdd80a3c161e0c4da171495e2c53780e7b8e9504 /arch | |
| parent | 274cfe5912eebe9d4e1a4c451fe617289a181fcf (diff) | |
| download | linux-9c803869f5f5e3d7ad94b2926474b2882e30073b.tar.xz | |
x86: apic - unify lapic_is_integrated
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/apic_32.c | 4 | ||||
| -rw-r--r-- | arch/x86/kernel/apic_64.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 9e8702eebd46..41134d4e6a66 100644 --- 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 } /* diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index 46523c0cc6f6..18c0b8cd2376 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c @@ -111,11 +111,15 @@ static inline int lapic_get_version(void) } /* - * Check, if the APIC is integrated or a seperate chip + * Check, if the APIC is integrated or a separate chip */ static inline int lapic_is_integrated(void) { +#ifdef CONFIG_X86_64 return 1; +#else + return APIC_INTEGRATED(lapic_get_version()); +#endif } /* |