diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-06-27 12:18:01 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-06-27 12:18:01 +0800 |
| commit | ffc4aa8f521606f63f59ff708f49780172909e94 (patch) | |
| tree | 274944bdc4c317e54faa95636c9f1771d8d51b43 /arch/sparc/kernel/winfixup.S | |
| parent | 46b4dd0c2535cbb70766f74bb9228ed81f59054d (diff) | |
| parent | 9ca1d50fa959cda1f04f43275f7930a70f1a631e (diff) | |
Merge tag 'v4.4.14' into linux-linaro-lsk-v4.4lsk-v4.4-16.06
This is the 4.4.14 stable release
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. |