diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-30 15:04:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-30 15:04:45 -0400 |
| commit | e58b7dab272ecee09cd7bafb89d6b224cd17bbe3 (patch) | |
| tree | c3834740725d93cdb3d89221cb24cf68fa688784 /include/asm-ia64/smp.h | |
| parent | 71d00feca2598c68186ca5b83247746d6a7fed7e (diff) | |
| parent | 3aff03739cb19938b25ac262be90faf58192e847 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Fix incorrect return value from ia64_setup_msi_irq()
[IA64] arch/ia64/sn/kernel/mca.c: undo lock when sn_oemdata can't be extended
[IA64] update sn2 defconfig to 64kb pages
[IA64] fix typo in per_cpu_offset
[IA64] /proc/cpuinfo "physical id" field cleanups
[IA64] vDSO vs --build-id
[IA64] check-segrel.lds vs --build-id
[IA64] vmcore_find_descriptor_size should be in __init
[IA64] ia64/mm/init.c: fix section mismatches
Diffstat (limited to 'include/asm-ia64/smp.h')
| -rw-r--r-- | include/asm-ia64/smp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-ia64/smp.h b/include/asm-ia64/smp.h index 471cc2ee9ac4..4fa733dd417a 100644 --- a/include/asm-ia64/smp.h +++ b/include/asm-ia64/smp.h | |||
| @@ -60,7 +60,6 @@ extern cpumask_t cpu_online_map; | |||
| 60 | extern cpumask_t cpu_core_map[NR_CPUS]; | 60 | extern cpumask_t cpu_core_map[NR_CPUS]; |
| 61 | DECLARE_PER_CPU(cpumask_t, cpu_sibling_map); | 61 | DECLARE_PER_CPU(cpumask_t, cpu_sibling_map); |
| 62 | extern int smp_num_siblings; | 62 | extern int smp_num_siblings; |
| 63 | extern int smp_num_cpucores; | ||
| 64 | extern void __iomem *ipi_base_addr; | 63 | extern void __iomem *ipi_base_addr; |
| 65 | extern unsigned char smp_int_redirect; | 64 | extern unsigned char smp_int_redirect; |
| 66 | 65 | ||