diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-07-21 13:58:19 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-07-21 13:58:19 +0800 |
| commit | 74b60e9f6f938d0cd4c7a71e583aee3cc6c5fbba (patch) | |
| tree | 15cbca70f3f6d7e10da7d82154a78e6ca35dca8c /arch/sparc/kernel/winfixup.S | |
| parent | f24f1475658431d60bcd4e6e5de951ba1663dd43 (diff) | |
| parent | 1d508e233d21a7848cf54d7d03b40dac2d9ea873 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-16.07-rt
Conflicts:
mm/swap.c
Diffstat (limited to 'arch/sparc/kernel/winfixup.S')
| -rw-r--r-- | arch/sparc/kernel/winfixup.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/kernel/winfixup.S b/arch/sparc/kernel/winfixup.S index 1e67ce958369..855019a8590e 100644 --- a/arch/sparc/kernel/winfixup.S +++ b/arch/sparc/kernel/winfixup.S @@ -32,8 +32,7 @@ fill_fixup: rd %pc, %g7 call do_sparc64_fault add %sp, PTREGS_OFF, %o0 - ba,pt %xcc, rtrap - nop + ba,a,pt %xcc, rtrap /* Be very careful about usage of the trap globals here. * You cannot touch %g5 as that has the fault information. |