diff options
Diffstat (limited to 'include/asm-i386/smp.h')
| -rw-r--r-- | include/asm-i386/smp.h | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/include/asm-i386/smp.h b/include/asm-i386/smp.h index 0f7ae1224..6fb2e2541 100644 --- a/include/asm-i386/smp.h +++ b/include/asm-i386/smp.h @@ -149,28 +149,6 @@ struct mpc_config_intlocal */ /* - * Per process x86 parameters - */ - -struct cpuinfo_x86 -{ - char hard_math; - char x86; - char x86_model; - char x86_mask; - char x86_vendor_id[16]; - int x86_capability; - int fdiv_bug; - int have_cpuid; - char wp_works_ok; - char hlt_works_ok; - unsigned long udelay_val; -}; - - -extern struct cpuinfo_x86 cpu_data[NR_CPUS]; - -/* * Private routines/data */ @@ -181,7 +159,6 @@ extern unsigned char *apic_reg; extern unsigned char boot_cpu_id; extern unsigned long cpu_present_map; extern volatile int cpu_number_map[NR_CPUS]; -extern volatile int cpu_logical_map[NR_CPUS]; extern volatile unsigned long smp_invalidate_needed; extern void smp_flush_tlb(void); extern volatile unsigned long kernel_flag, kernel_counter; @@ -193,6 +170,11 @@ extern unsigned long ipi_count; extern void smp_invalidate_rcv(void); /* Process an NMI */ extern void smp_local_timer_interrupt(struct pt_regs * regs); extern void setup_APIC_clock (void); +extern volatile int __cpu_logical_map[NR_CPUS]; +extern inline int cpu_logical_map(int cpu) +{ + return __cpu_logical_map[cpu]; +} /* @@ -257,5 +239,12 @@ extern __inline int hard_smp_processor_id(void) #define SMP_FROM_INT 1 #define SMP_FROM_SYSCALL 2 +#else +#ifndef ASSEMBLY +extern inline int cpu_logical_map(int cpu) +{ + return cpu; +} +#endif #endif #endif |