2 files changed, 8 insertions, 6 deletions

diff --git a/arch/mips/netlogic/common/irq.c b/arch/mips/netlogic/common/irq.c
index 3800bf6551ab..8092bb320618 100644
--- a/arch/mips/netlogic/common/irq.c
+++ b/arch/mips/netlogic/common/irq.c
@@ -223,7 +223,7 @@ static void nlm_init_node_irqs(int node)
                         continue;
 
                 nlm_pic_init_irt(nodep->picbase, irt, i,
-                                        node * NLM_CPUS_PER_NODE, 0);
+                                node * nlm_threads_per_node(), 0);
                 nlm_setup_pic_irq(node, i, i, irt);
         }
 }
@@ -232,8 +232,8 @@ void nlm_smp_irq_init(int hwcpuid)
 {
         int node, cpu;
 
-        node = hwcpuid / NLM_CPUS_PER_NODE;
-        cpu  = hwcpuid % NLM_CPUS_PER_NODE;
+        node = nlm_cpuid_to_node(hwcpuid);
+        cpu  = hwcpuid % nlm_threads_per_node();
 
         if (cpu == 0 && node != 0)
                 nlm_init_node_irqs(node);
diff --git a/arch/mips/netlogic/common/smp.c b/arch/mips/netlogic/common/smp.c
index c0eded01fde9..6baae15cc7b1 100644
--- a/arch/mips/netlogic/common/smp.c
+++ b/arch/mips/netlogic/common/smp.c
@@ -63,7 +63,7 @@ void nlm_send_ipi_single(int logical_cpu, unsigned int action)
         uint64_t picbase;
 
         cpu = cpu_logical_map(logical_cpu);
-        node = cpu / NLM_CPUS_PER_NODE;
+        node = nlm_cpuid_to_node(cpu);
         picbase = nlm_get_node(node)->picbase;
 
         if (action & SMP_CALL_FUNCTION)
@@ -152,7 +152,7 @@ void nlm_boot_secondary(int logical_cpu, struct task_struct *idle)
         int cpu, node;
 
         cpu = cpu_logical_map(logical_cpu);
-        node = cpu / NLM_CPUS_PER_NODE;
+        node = nlm_cpuid_to_node(logical_cpu);
         nlm_next_sp = (unsigned long)__KSTK_TOS(idle);
         nlm_next_gp = (unsigned long)task_thread_info(idle);
 
@@ -164,7 +164,7 @@ void nlm_boot_secondary(int logical_cpu, struct task_struct *idle)
 void __init nlm_smp_setup(void)
 {
         unsigned int boot_cpu;
-        int num_cpus, i, ncore;
+        int num_cpus, i, ncore, node;
         volatile u32 *cpu_ready = nlm_get_boot_data(BOOT_CPU_READY);
         char buf[64];
 
@@ -187,6 +187,8 @@ void __init nlm_smp_setup(void)
                         __cpu_number_map[i] = num_cpus;
                         __cpu_logical_map[num_cpus] = i;
                         set_cpu_possible(num_cpus, true);
+                        node = nlm_cpuid_to_node(i);
+                        cpumask_set_cpu(num_cpus, &nlm_get_node(node)->cpumask);
                         ++num_cpus;
                 }
         }