diff options
| author | Jan Beulich <jbeulich@novell.com> | 2007-05-02 13:27:04 -0400 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2007-05-02 13:27:04 -0400 |
| commit | 00f1ea696702163b7411d2316264525996c66ed3 (patch) | |
| tree | 96f6653c288c1a2046eecfd8d8c17e7b96136ea7 /include/asm-i386/smp.h | |
| parent | 28609f6e4921ebb75ceaf5317454b8047b07cef4 (diff) | |
[PATCH] x86: adjust inclusion of asm/fixmap.h
Move inclusion of asm/fixmap.h to where it is really used rather than
where it may have been used long ago (requires a few other adjustments
to includes due to previous implicit dependencies).
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'include/asm-i386/smp.h')
| -rw-r--r-- | include/asm-i386/smp.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/asm-i386/smp.h b/include/asm-i386/smp.h index 6bf0033a301c..9cab1531c613 100644 --- a/include/asm-i386/smp.h +++ b/include/asm-i386/smp.h | |||
| @@ -11,16 +11,13 @@ | |||
| 11 | #include <asm/pda.h> | 11 | #include <asm/pda.h> |
| 12 | #endif | 12 | #endif |
| 13 | 13 | ||
| 14 | #ifdef CONFIG_X86_LOCAL_APIC | 14 | #if defined(CONFIG_X86_LOCAL_APIC) && !defined(__ASSEMBLY__) |
| 15 | #ifndef __ASSEMBLY__ | ||
| 16 | #include <asm/fixmap.h> | ||
| 17 | #include <asm/bitops.h> | 15 | #include <asm/bitops.h> |
| 18 | #include <asm/mpspec.h> | 16 | #include <asm/mpspec.h> |
| 17 | #include <asm/apic.h> | ||
| 19 | #ifdef CONFIG_X86_IO_APIC | 18 | #ifdef CONFIG_X86_IO_APIC |
| 20 | #include <asm/io_apic.h> | 19 | #include <asm/io_apic.h> |
| 21 | #endif | 20 | #endif |
| 22 | #include <asm/apic.h> | ||
| 23 | #endif | ||
| 24 | #endif | 21 | #endif |
| 25 | 22 | ||
| 26 | #define BAD_APICID 0xFFu | 23 | #define BAD_APICID 0xFFu |