From b5646f1823cfb7bfe2d90233125733c780027f65 Mon Sep 17 00:00:00 2001
From: Hillf Danton <dhillf@gmail.com>
Date: Wed, 16 Nov 2011 00:21:29 +0000
Subject: [PATCH] --- yaml --- r: 284793 b: refs/heads/master c:
 b3ea581834c1e36cc76589e63dedcd99fd6abf51 h: refs/heads/master i:   284791:
 388b668356180f0411f92a1a1b2f7575c4d4aa26 v: v3

---
 [refs]                                |  2 +-
 trunk/arch/mips/netlogic/common/smp.c | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ecfd1b61b031..309fe774296b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2aa54b2009bb4f85cdc42d16dde18093dd832a31
+refs/heads/master: b3ea581834c1e36cc76589e63dedcd99fd6abf51
diff --git a/trunk/arch/mips/netlogic/common/smp.c b/trunk/arch/mips/netlogic/common/smp.c
index 476c93ef3037..db17f49886c2 100644
--- a/trunk/arch/mips/netlogic/common/smp.c
+++ b/trunk/arch/mips/netlogic/common/smp.c
@@ -108,9 +108,16 @@ void nlm_early_init_secondary(int cpu)
  */
 static void __cpuinit nlm_init_secondary(void)
 {
+	current_cpu_data.core = hard_smp_processor_id() / 4;
 	nlm_smp_irq_init();
 }
 
+void nlm_prepare_cpus(unsigned int max_cpus)
+{
+	/* declare we are SMT capable */
+	smp_num_siblings = nlm_threads_per_core;
+}
+
 void nlm_smp_finish(void)
 {
 #ifdef notyet
@@ -183,10 +190,6 @@ void __init nlm_smp_setup(void)
 	nlm_set_nmi_handler(nlm_boot_secondary_cpus);
 }
 
-void nlm_prepare_cpus(unsigned int max_cpus)
-{
-}
-
 static int nlm_parse_cpumask(u32 cpu_mask)
 {
 	uint32_t core0_thr_mask, core_thr_mask;