diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-22 03:06:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-22 03:06:21 -0400 |
| commit | 76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b (patch) | |
| tree | 3824e008db9d554229a70c85fbbc13238276bd7a /include/asm-x86/smp.h | |
| parent | 7be42004065ce4df193aeef5befd26805267d0d9 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
Merge branch 'linus' into x86/x2apic
Diffstat (limited to 'include/asm-x86/smp.h')
| -rw-r--r-- | include/asm-x86/smp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h index 1896cdb0076a..59d6cfcc404b 100644 --- a/include/asm-x86/smp.h +++ b/include/asm-x86/smp.h | |||
| @@ -25,6 +25,8 @@ extern cpumask_t cpu_callin_map; | |||
| 25 | extern void (*mtrr_hook)(void); | 25 | extern void (*mtrr_hook)(void); |
| 26 | extern void zap_low_mappings(void); | 26 | extern void zap_low_mappings(void); |
| 27 | 27 | ||
| 28 | extern int __cpuinit get_local_pda(int cpu); | ||
| 29 | |||
| 28 | extern int smp_num_siblings; | 30 | extern int smp_num_siblings; |
| 29 | extern unsigned int num_processors; | 31 | extern unsigned int num_processors; |
| 30 | extern cpumask_t cpu_initialized; | 32 | extern cpumask_t cpu_initialized; |