X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-ia64%2Fsmp.h;h=471cc2ee9ac4c10be30a3b6d772f53912593d90e;hb=69450bb5eb8e9df28281c62f98e971c9969dc4ff;hp=6314b29e8c4d6e32f249f3fb9376bc02e86ec729;hpb=46b2835771ad8ef19b8e081e8c90439408c7645f;p=linux-2.6

diff --git a/include/asm-ia64/smp.h b/include/asm-ia64/smp.h
index 6314b29e8c..471cc2ee9a 100644
--- a/include/asm-ia64/smp.h
+++ b/include/asm-ia64/smp.h
@@ -14,8 +14,8 @@
 #include <linux/threads.h>
 #include <linux/kernel.h>
 #include <linux/cpumask.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/param.h>
 #include <asm/processor.h>
@@ -58,7 +58,7 @@ extern char no_int_routing __devinitdata;
 
 extern cpumask_t cpu_online_map;
 extern cpumask_t cpu_core_map[NR_CPUS];
-extern cpumask_t cpu_sibling_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;