diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-06 22:53:35 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-06 22:53:35 -0400 |
| commit | eeca9fad52fc4bfdf42c38bfcf383e932eb3e9d6 (patch) | |
| tree | cc51c880459d41c0e8d7576405bef4c987bc7aa0 /arch/mips/kernel/r4k_switch.S | |
| parent | ff6f83fc9d44db09997937c3475d525a6866fbb4 (diff) | |
| parent | b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge upstream tree in order to reinstate crct10dif.
Diffstat (limited to 'arch/mips/kernel/r4k_switch.S')
| -rw-r--r-- | arch/mips/kernel/r4k_switch.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S index 5e51219990aa..921238a6bd26 100644 --- a/arch/mips/kernel/r4k_switch.S +++ b/arch/mips/kernel/r4k_switch.S | |||
| @@ -68,6 +68,12 @@ | |||
| 68 | # clobbers t1 | 68 | # clobbers t1 |
| 69 | 1: | 69 | 1: |
| 70 | 70 | ||
| 71 | #if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP) | ||
| 72 | PTR_L t8, __stack_chk_guard | ||
| 73 | LONG_L t9, TASK_STACK_CANARY(a1) | ||
| 74 | LONG_S t9, 0(t8) | ||
| 75 | #endif | ||
| 76 | |||
| 71 | /* | 77 | /* |
| 72 | * The order of restoring the registers takes care of the race | 78 | * The order of restoring the registers takes care of the race |
| 73 | * updating $28, $29 and kernelsp without disabling ints. | 79 | * updating $28, $29 and kernelsp without disabling ints. |