Commit a6a86044 authored by Jesse Barnes's avatar Jesse Barnes Committed by David Mosberger

[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.
parent db503238
...@@ -467,10 +467,10 @@ smp_build_cpu_map (void) ...@@ -467,10 +467,10 @@ smp_build_cpu_map (void)
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
/* on which node is each logical CPU (one cacheline even for 64 CPUs) */ /* 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); EXPORT_SYMBOL(cpu_to_node_map);
/* which logical CPUs are on which nodes */ /* 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. * Build cpu to node mapping and initialize the per node cpu masks.
...@@ -566,8 +566,8 @@ smp_cpus_done (unsigned int dummy) ...@@ -566,8 +566,8 @@ smp_cpus_done (unsigned int dummy)
if (cpu_online(cpu)) if (cpu_online(cpu))
bogosum += cpu_data(cpu)->loops_per_jiffy; bogosum += cpu_data(cpu)->loops_per_jiffy;
printk(KERN_INFO "Total of %lu processors activated (%lu.%02lu BogoMIPS).\n", printk(KERN_INFO "Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
num_online_cpus(), bogosum/(500000/HZ), (bogosum/(5000/HZ))%100); (int)num_online_cpus(), bogosum/(500000/HZ), (bogosum/(5000/HZ))%100);
} }
int __devinit int __devinit
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
#include <asm/mmzone.h> #include <asm/mmzone.h>
extern volatile u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned; extern u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
extern volatile cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned; extern cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
/* Stuff below this line could be architecture independent */ /* Stuff below this line could be architecture independent */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment