diff options
| author | Ingo Molnar | 2008-07-22 09:06:21 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-22 09:06:21 +0200 |
| commit | 76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b (patch) | |
| tree | 3824e008db9d554229a70c85fbbc13238276bd7a /include/asm-x86/smp.h | |
| parent | x86, lguest: fix apic_ops build on UP (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| download | kernel-qcow2-linux-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.tar.gz kernel-qcow2-linux-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.tar.xz kernel-qcow2-linux-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.zip | |
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; extern void (*mtrr_hook)(void); extern void zap_low_mappings(void); +extern int __cpuinit get_local_pda(int cpu); + extern int smp_num_siblings; extern unsigned int num_processors; extern cpumask_t cpu_initialized; |