memblock: replace alloc_bootmem_node with memblock_alloc_node

[sfrench/cifs-2.6.git] / arch / ia64 / sn / kernel / setup.c

diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index 36182c84363ce914d15f34a5be72afdc6f580b46..ab2564f95199ff97692aec76d279ac49e5990bca 100644 (file)
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -511,7 +511,7 @@ static void __init sn_init_pdas(char **cmdline_p)
         */
        for_each_online_node(cnode) {
                nodepdaindr[cnode] =
-                   alloc_bootmem_node(NODE_DATA(cnode), sizeof(nodepda_t));
+                   memblock_alloc_node(sizeof(nodepda_t), 0, cnode);
                memset(nodepdaindr[cnode]->phys_cpuid, -1,
                    sizeof(nodepdaindr[cnode]->phys_cpuid));
                spin_lock_init(&nodepdaindr[cnode]->ptc_lock);
@@ -522,7 +522,7 @@ static void __init sn_init_pdas(char **cmdline_p)
         */
        for (cnode = num_online_nodes(); cnode < num_cnodes; cnode++)
                nodepdaindr[cnode] =
-                   alloc_bootmem_node(NODE_DATA(0), sizeof(nodepda_t));
+                   memblock_alloc_node(sizeof(nodepda_t), 0, 0);
 
        /*
         * Now copy the array of nodepda pointers to each nodepda.
@@ -629,7 +629,7 @@ void sn_cpu_init(void)
 
        cnode = nasid_to_cnodeid(nasid);
 
-       sn_nodepda = nodepdaindr[cnode];
+       __this_cpu_write(__sn_nodepda, nodepdaindr[cnode]);
 
        pda->led_address =
            (typeof(pda->led_address)) (LED0 + (slice << LED_CPU_SHIFT));