x86: fix setup.c printk format warning

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index dd12c1c84a8fcd8179df2cfb02412ff349def4de..d4eaa4eb481dbf403ca2cef585dbf4225fc4a023 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -169,7 +169,7 @@ void __init setup_per_cpu_areas(void)
 
        /* Copy section for each CPU (we discard the original) */
        size = PERCPU_ENOUGH_ROOM;
-       printk(KERN_INFO "PERCPU: Allocating %lu bytes of per cpu data\n",
+       printk(KERN_INFO "PERCPU: Allocating %zd bytes of per cpu data\n",
                          size);
 
        for_each_possible_cpu(cpu) {
@@ -350,6 +350,7 @@ cpumask_t *_node_to_cpumask_ptr(int node)
                dump_stack();
                return &cpu_online_map;
        }
+       BUG_ON(node >= nr_node_ids);
        return &node_to_cpumask_map[node];
 }
 EXPORT_SYMBOL(_node_to_cpumask_ptr);
@@ -365,6 +366,7 @@ cpumask_t node_to_cpumask(int node)
                dump_stack();
                return cpu_online_map;
        }
+       BUG_ON(node >= nr_node_ids);
        return node_to_cpumask_map[node];
 }
 EXPORT_SYMBOL(node_to_cpumask);