diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-03-27 14:05:59 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:41:32 +0200 |
| commit | c1fa6c977eb978e1d09867475ec59c9a5799127f (patch) | |
| tree | aa9fa8e76d728ac73f4ca0fa4a371beb60a15496 /include | |
| parent | 1b00084386878f25c2c591ad19cb625880d4089d (diff) | |
x86: surround apic headers in apic definitions
Although those constants are always defined in x86_64,
and will have the effect of just including the headers
in the very way we did before, I'm doing this in a separate
patch to be conservative and avoid surprises.
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/smp_64.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h index 015d36e29ad..b83151d7388 100644 --- a/include/asm-x86/smp_64.h +++ b/include/asm-x86/smp_64.h @@ -7,9 +7,13 @@ /* * We need the APIC definitions automatically as part of 'smp.h' */ -#include <asm/apic.h> -#include <asm/io_apic.h> -#include <asm/mpspec.h> +#ifdef CONFIG_X86_LOCAL_APIC +# include <asm/mpspec.h> +# include <asm/apic.h> +# ifdef CONFIG_X86_IO_APIC +# include <asm/io_apic.h> +# endif +#endif #include <asm/pda.h> #include <asm/thread_info.h> |