diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-03-08 10:48:00 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-03-08 10:48:00 (GMT) |
commit | a1a8ba2d4a7cf9884b97b733b45692f9114c5132 (patch) | |
tree | 3b342c5071c347bdfa0fe6bf9274c30c75ea18d3 /arch/sparc/kernel/hvcalls.S | |
parent | b2f9d678e28ca71ce650eac82f26dd287b47e89a (diff) | |
parent | e2857b8f11a289ed2b61d18d0665e05c1053c446 (diff) | |
download | linux-a1a8ba2d4a7cf9884b97b733b45692f9114c5132.tar.xz |
Merge branch 'linus' into ras/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sparc/kernel/hvcalls.S')
-rw-r--r-- | arch/sparc/kernel/hvcalls.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/kernel/hvcalls.S b/arch/sparc/kernel/hvcalls.S index afbaba5..d127130 100644 --- a/arch/sparc/kernel/hvcalls.S +++ b/arch/sparc/kernel/hvcalls.S @@ -338,8 +338,9 @@ ENTRY(sun4v_mach_set_watchdog) mov %o1, %o4 mov HV_FAST_MACH_SET_WATCHDOG, %o5 ta HV_FAST_TRAP + brnz,a,pn %o4, 0f stx %o1, [%o4] - retl +0: retl nop ENDPROC(sun4v_mach_set_watchdog) |