Merge branch 'merge'

[linux-2.6-block.git] / arch / powerpc / mm / numa.c

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index e89b22aa539e477e79ad9dc26181d09aa19e859a..ea816c618a7b55d2c1b657c0f8b5f6720f1d482c 100644 (file)
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -465,9 +465,9 @@ static void __init setup_nonnuma(void)
        unsigned long total_ram = lmb_phys_mem_size();
        unsigned int i;
 
-       printk(KERN_INFO "Top of RAM: 0x%lx, Total RAM: 0x%lx\n",
+       printk(KERN_DEBUG "Top of RAM: 0x%lx, Total RAM: 0x%lx\n",
               top_of_ram, total_ram);
-       printk(KERN_INFO "Memory hole size: %ldMB\n",
+       printk(KERN_DEBUG "Memory hole size: %ldMB\n",
               (top_of_ram - total_ram) >> 20);
 
        for (i = 0; i < lmb.memory.cnt; ++i)
@@ -485,7 +485,7 @@ void __init dump_numa_cpu_topology(void)
                return;
 
        for_each_online_node(node) {
-               printk(KERN_INFO "Node %d CPUs:", node);
+               printk(KERN_DEBUG "Node %d CPUs:", node);
 
                count = 0;
                /*
@@ -521,7 +521,7 @@ static void __init dump_numa_memory_topology(void)
        for_each_online_node(node) {
                unsigned long i;
 
-               printk(KERN_INFO "Node %d Memory:", node);
+               printk(KERN_DEBUG "Node %d Memory:", node);
 
                count = 0;
 
@@ -756,6 +756,7 @@ int hot_add_scn_to_nid(unsigned long scn_addr)
        struct device_node *memory = NULL;
        nodemask_t nodes;
        int default_nid = any_online_node(NODE_MASK_ALL);
+       int nid;
 
        if (!numa_enabled || (min_common_depth < 0))
                return default_nid;
@@ -790,6 +791,7 @@ ha_new_range:
                        goto ha_new_range;
        }
        BUG();  /* section address should be found above */
+       return 0;
 
        /* Temporary code to ensure that returned node is not empty */
 got_nid: