summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-30 20:04:45 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-30 20:04:45 +0100
commite58b7dab272ecee09cd7bafb89d6b224cd17bbe3 (patch)
treec3834740725d93cdb3d89221cb24cf68fa688784 /include
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parent[IA64] Fix incorrect return value from ia64_setup_msi_irq() (diff)
downloadlinux-e58b7dab272ecee09cd7bafb89d6b224cd17bbe3.tar.xz
linux-e58b7dab272ecee09cd7bafb89d6b224cd17bbe3.zip
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')
-rw-r--r--include/asm-ia64/percpu.h2
-rw-r--r--include/asm-ia64/smp.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-ia64/percpu.h b/include/asm-ia64/percpu.h
index 43a7aac414e0..c4f1e328a5ba 100644
--- a/include/asm-ia64/percpu.h
+++ b/include/asm-ia64/percpu.h
@@ -46,7 +46,7 @@
#ifdef CONFIG_SMP
extern unsigned long __per_cpu_offset[NR_CPUS];
-#define per_cpu_offset(x) (__per_cpu_offset(x))
+#define per_cpu_offset(x) (__per_cpu_offset[x])
/* Equal to __per_cpu_offset[smp_processor_id()], but faster to access: */
DECLARE_PER_CPU(unsigned long, local_per_cpu_offset);
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;
extern cpumask_t cpu_core_map[NR_CPUS];
DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);
extern int smp_num_siblings;
-extern int smp_num_cpucores;
extern void __iomem *ipi_base_addr;
extern unsigned char smp_int_redirect;