diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /include/asm-i386/fixmap.h | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'include/asm-i386/fixmap.h')
| -rw-r--r-- | include/asm-i386/fixmap.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/include/asm-i386/fixmap.h b/include/asm-i386/fixmap.h index ae6f062dd..c259a45ee 100644 --- a/include/asm-i386/fixmap.h +++ b/include/asm-i386/fixmap.h @@ -11,8 +11,9 @@ #ifndef _ASM_FIXMAP_H #define _ASM_FIXMAP_H -#include <asm/page.h> +#include <linux/config.h> #include <linux/kernel.h> +#include <asm/page.h> /* * Here we define all the compile-time 'special' virtual @@ -40,10 +41,18 @@ * fix-mapped? */ enum fixed_addresses { -#ifdef __SMP__ - FIX_APIC_BASE, +#ifdef CONFIG_X86_LOCAL_APIC + FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */ +#endif +#ifdef CONFIG_X86_IO_APIC FIX_IO_APIC_BASE, #endif +#ifdef CONFIG_X86_VISWS_APIC + FIX_CO_CPU, /* Cobalt timer */ + FIX_CO_APIC, /* Cobalt APIC Redirection Table */ + FIX_LI_PCIA, /* Lithium PCI Bridge A */ + FIX_LI_PCIB, /* Lithium PCI Bridge B */ +#endif __end_of_fixed_addresses }; |