diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-10-17 10:04:47 -0400 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-10-17 10:41:49 -0400 |
| commit | 13acfd5715144518232d8e29acf7c76ef1b089d8 (patch) | |
| tree | 093c4311a737210bbdd3d1919f8193cb5f017241 /arch/mips/kernel/r4k_switch.S | |
| parent | d570142674890fe10b3d7d86aa105e3dfce1ddfa (diff) | |
| parent | 34ec4de42be5006abdd8d0c08b306ffaa64d0d5d (diff) | |
Powerpc KVM work is based on a commit after rc4.
Merging master into next to satisfy the dependencies.
Conflicts:
arch/arm/kvm/reset.c
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 |