diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-08-28 18:37:31 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-08-28 18:37:31 +0100 |
| commit | cdf0bfb0126bbd8c5424ca01fd59fd70d8ea80f9 (patch) | |
| tree | e7864d3dacf433b7ccbe17a49b2e72b6a4b3a24c /arch/mips/kernel/bmips_vec.S | |
| parent | b4f656eea63376da79b0b5a17660c4ce14b71b74 (diff) | |
| parent | 6af396a6b6c698eb3834184518fc9a59bc22c817 (diff) | |
Merge branch 'for-rmk/barriers' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Diffstat (limited to 'arch/mips/kernel/bmips_vec.S')
| -rw-r--r-- | arch/mips/kernel/bmips_vec.S | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/mips/kernel/bmips_vec.S b/arch/mips/kernel/bmips_vec.S index f739aedcb50..bd79c4f9bff 100644 --- a/arch/mips/kernel/bmips_vec.S +++ b/arch/mips/kernel/bmips_vec.S @@ -54,7 +54,11 @@ LEAF(bmips_smp_movevec) /* set up CPU1 CBR; move BASE to 0xa000_0000 */ li k0, 0xff400000 mtc0 k0, $22, 6 - li k1, CKSEG1 | BMIPS_RELO_VECTOR_CONTROL_1 + /* set up relocation vector address based on thread ID */ + mfc0 k1, $22, 3 + srl k1, 16 + andi k1, 0x8000 + or k1, CKSEG1 | BMIPS_RELO_VECTOR_CONTROL_0 or k0, k1 li k1, 0xa0080000 sw k1, 0(k0) |