[PATCH] ia64: kill some more warnings

Kills a warning and a false sense of safety by removing the volatile
qualifier on cpu_to_node_map[] and node_to_cpu_mask[].  Also fix the
printk for total processors since num_online_cpus() can return an int or
a long depending on the value of NR_CPUS.

diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 59c58a7f3f76137d409e46a4ce551fad68945f5c..a578efff3a795c18100551be0b235c4365399be8 100644 (file)
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -467,10 +467,10 @@ smp_build_cpu_map (void)
 #ifdef CONFIG_NUMA
 
 /* on which node is each logical CPU (one cacheline even for 64 CPUs) */
-volatile u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
+u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
 EXPORT_SYMBOL(cpu_to_node_map);
 /* which logical CPUs are on which nodes */
-volatile cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
+cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
 
 /*
  * Build cpu to node mapping and initialize the per node cpu masks.
@@ -566,8 +566,8 @@ smp_cpus_done (unsigned int dummy)
                if (cpu_online(cpu))
                        bogosum += cpu_data(cpu)->loops_per_jiffy;
 
-       printk(KERN_INFO "Total of %lu processors activated (%lu.%02lu BogoMIPS).\n",
-              num_online_cpus(), bogosum/(500000/HZ), (bogosum/(5000/HZ))%100);
+       printk(KERN_INFO "Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
+              (int)num_online_cpus(), bogosum/(500000/HZ), (bogosum/(5000/HZ))%100);
 }
 
 int __devinit

diff --git a/include/asm-ia64/numa.h b/include/asm-ia64/numa.h
index 12acb2eb1ce3b7f42fa97cd8a835375babd0fb64..de73c7000a5214e32b44fa3680aed5830c353728 100644 (file)
--- a/include/asm-ia64/numa.h
+++ b/include/asm-ia64/numa.h
@@ -23,8 +23,8 @@
 
 #include <asm/mmzone.h>
 
-extern volatile u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
-extern volatile cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
+extern u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
+extern cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
 
 /* Stuff below this line could be architecture independent */