diff options
| author | Patrick Mochel <mochel@osdl.org> | 2002-07-31 22:24:41 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2002-07-31 22:24:41 -0700 |
| commit | 9e27f077152b4aa70184166406eed14005a83faa (patch) | |
| tree | 74d8c57e5efb6ffdefcd5e9766ba56a58d24d6f0 /include | |
| parent | 137973c1a3ee75e3d28af550a5e33737ac9acc5b (diff) | |
| parent | 8a24c0b94488c734eddee9d07e61adcbe441919f (diff) | |
Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-driverfs-api
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/smp.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-i386/smp.h b/include/asm-i386/smp.h index 6b116b38a4e2..a6d46dec1d09 100644 --- a/include/asm-i386/smp.h +++ b/include/asm-i386/smp.h @@ -85,7 +85,9 @@ extern volatile int logical_apicid_to_cpu[MAX_APICID]; */ #define smp_processor_id() (current_thread_info()->cpu) -#define cpu_possible(cpu) (phys_cpu_present_map & (1<<(cpu))) +extern volatile unsigned long cpu_callout_map; + +#define cpu_possible(cpu) (cpu_callout_map & (1<<(cpu))) #define cpu_online(cpu) (cpu_online_map & (1<<(cpu))) extern inline unsigned int num_online_cpus(void) @@ -113,7 +115,6 @@ static __inline int logical_smp_processor_id(void) return GET_APIC_LOGICAL_ID(*(unsigned long *)(APIC_BASE+APIC_LDR)); } -extern volatile unsigned long cpu_callout_map; /* We don't mark CPUs online until __cpu_up(), so we need another measure */ static inline int num_booting_cpus(void) { |