Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 344141
b: refs/heads/master
c: feddaf7
h: refs/heads/master
i:
  344139: 08ba911
v: v3
  • Loading branch information
Jayachandran C authored and John Crispin committed Nov 9, 2012
1 parent f040246 commit b66e522
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 862e509b7e31198578449ce356e14a37bd8a6ac7
refs/heads/master: feddaf7d89d554b705e7eb14a9202c4946e57c8e
2 changes: 1 addition & 1 deletion trunk/arch/mips/netlogic/common/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void nlm_early_init_secondary(int cpu)
change_c0_config(CONF_CM_CMASK, 0x3);
write_c0_ebase((uint32_t)nlm_common_ebase);
#ifdef CONFIG_CPU_XLP
if (hard_smp_processor_id() % 4 == 0)
if (cpu % 4 == 0)
xlp_mmu_init();
#endif
}
Expand Down
4 changes: 3 additions & 1 deletion trunk/arch/mips/netlogic/common/smpboot.S
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ EXPORT(nlm_boot_siblings)
* jump to the secondary wait function.
*/
mfc0 v0, CP0_EBASE, 1
andi v0, 0x7f /* v0 <- node/core */
andi v0, 0x3ff /* v0 <- node/core */

/* Init MMU in the first thread after changing THREAD_MODE
* register (Ax Errata?)
Expand Down Expand Up @@ -263,6 +263,8 @@ NESTED(nlm_boot_secondary_cpus, 16, sp)
PTR_L gp, 0(t1)

/* a0 has the processor id */
mfc0 a0, CP0_EBASE, 1
andi a0, 0x3ff /* a0 <- node/core */
PTR_LA t0, nlm_early_init_secondary
jalr t0
nop
Expand Down

0 comments on commit b66e522

Please sign in to comment.