diff options
| author | Martin J. Bligh <martin.bligh@us.ibm.com> | 2002-10-15 05:38:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-15 05:38:07 -0700 |
| commit | 246f38c2f955fee0a292c2673ae84dd96dc09913 (patch) | |
| tree | a95357a5dd36e0f6ad6a73b9b1833e41d431944a /include | |
| parent | 8d7dfcd0aa8047e39cd67a051568aec14326e28e (diff) | |
[PATCH] Summit: APIC ID mapping
Adds a raw_phys_apicid array that maps from the mps cpu number
to the apicid - this is needed because the apicids for Summit can be
larger than 32, and thus won't fit into the bitmap. Also adds little wrappers
to map neatly between the two.
Bumps up MAX_APICS for Summit.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/mpspec.h | 6 | ||||
| -rw-r--r-- | include/asm-i386/smp.h | 1 | ||||
| -rw-r--r-- | include/asm-i386/smpboot.h | 9 |
3 files changed, 4 insertions, 12 deletions
diff --git a/include/asm-i386/mpspec.h b/include/asm-i386/mpspec.h index f2a73c118d33..6fee20b0ef9f 100644 --- a/include/asm-i386/mpspec.h +++ b/include/asm-i386/mpspec.h @@ -16,11 +16,11 @@ /* * a maximum of 16 APICs with the current APIC ID architecture. */ -#ifdef CONFIG_X86_NUMAQ +#ifdef CONFIG_X86_NUMA #define MAX_APICS 256 -#else /* !CONFIG_X86_NUMAQ */ +#else /* !CONFIG_X86_NUMA */ #define MAX_APICS 16 -#endif /* CONFIG_X86_NUMAQ */ +#endif /* CONFIG_X86_NUMA */ #define MAX_MPC_ENTRY 1024 diff --git a/include/asm-i386/smp.h b/include/asm-i386/smp.h index a0d552e5d843..6df7592b84f5 100644 --- a/include/asm-i386/smp.h +++ b/include/asm-i386/smp.h @@ -65,6 +65,7 @@ extern void zap_low_mappings (void); * the real APIC ID <-> CPU # mapping. */ #define MAX_APICID 256 +#define BAD_APICID 0xFFu extern volatile int cpu_to_physical_apicid[NR_CPUS]; extern volatile int physical_apicid_to_cpu[MAX_APICID]; extern volatile int cpu_to_logical_apicid[NR_CPUS]; diff --git a/include/asm-i386/smpboot.h b/include/asm-i386/smpboot.h index 6a77a1663ca9..a3840aa6eca8 100644 --- a/include/asm-i386/smpboot.h +++ b/include/asm-i386/smpboot.h @@ -24,15 +24,6 @@ #endif /* CONFIG_CLUSTERED_APIC */ /* - * How to map from the cpu_present_map - */ -#ifdef CONFIG_CLUSTERED_APIC - #define cpu_present_to_apicid(mps_cpu) ( ((mps_cpu/4)*16) + (1<<(mps_cpu%4)) ) -#else /* !CONFIG_CLUSTERED_APIC */ - #define cpu_present_to_apicid(apicid) (apicid) -#endif /* CONFIG_CLUSTERED_APIC */ - -/* * Mappings between logical cpu number and logical / physical apicid * The first four macros are trivial, but it keeps the abstraction consistent */ |