projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'spi/topic/dma' into spi-next
[cascardo/linux.git]
/
arch
/
sparc
/
kernel
/
hvcalls.S
diff --git
a/arch/sparc/kernel/hvcalls.S
b/arch/sparc/kernel/hvcalls.S
index
afbaba5
..
d127130
100644
(file)
--- 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)