Merge branch '4.2-fixes' into mips-for-linux-next
This commit is contained in:
@@ -152,7 +152,7 @@ dcache_done:
|
||||
|
||||
/* Enter the coherent domain */
|
||||
li t0, 0xff
|
||||
PTR_S t0, GCR_CL_COHERENCE_OFS(v1)
|
||||
sw t0, GCR_CL_COHERENCE_OFS(v1)
|
||||
ehb
|
||||
|
||||
/* Jump to kseg0 */
|
||||
@@ -302,7 +302,7 @@ LEAF(mips_cps_boot_vpes)
|
||||
PTR_L t0, 0(t0)
|
||||
|
||||
/* Calculate a pointer to this cores struct core_boot_config */
|
||||
PTR_L t0, GCR_CL_ID_OFS(t0)
|
||||
lw t0, GCR_CL_ID_OFS(t0)
|
||||
li t1, COREBOOTCFG_SIZE
|
||||
mul t0, t0, t1
|
||||
PTR_LA t1, mips_cps_core_bootcfg
|
||||
|
Reference in New Issue
Block a user