diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-10-19 16:31:14 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-19 16:31:14 -0400 |
| commit | 20c87bd40e6c1ff7e31cc5eea4fb37829a57eb58 (patch) | |
| tree | 528c2f113e428e060e185ccab7eab8d8e87c7d36 /arch/mips/kernel/r4k_switch.S | |
| parent | d14df339c72b6efbba4eddd1d1f3f4b173273f74 (diff) | |
| parent | 40f8989695660dee984338861ca9900b8e0b5183 (diff) | |
Merge tag 'asoc-v3.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.12
A number of small, fairly unexciting, fixes for drivers - nothing stand
out.
Diffstat (limited to 'arch/mips/kernel/r4k_switch.S')
| -rw-r--r-- | arch/mips/kernel/r4k_switch.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S index 921238a6bd26..078de5eaca8f 100644 --- a/arch/mips/kernel/r4k_switch.S +++ b/arch/mips/kernel/r4k_switch.S | |||
| @@ -69,7 +69,7 @@ | |||
| 69 | 1: | 69 | 1: |
| 70 | 70 | ||
| 71 | #if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP) | 71 | #if defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_SMP) |
| 72 | PTR_L t8, __stack_chk_guard | 72 | PTR_LA t8, __stack_chk_guard |
| 73 | LONG_L t9, TASK_STACK_CANARY(a1) | 73 | LONG_L t9, TASK_STACK_CANARY(a1) |
| 74 | LONG_S t9, 0(t8) | 74 | LONG_S t9, 0(t8) |
| 75 | #endif | 75 | #endif |