diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2017-03-09 20:07:36 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2017-03-09 20:07:36 +0000 |
| commit | 3bfa317547ff61afb951fb74095edb2e0d0d6a00 (patch) | |
| tree | 84b41b3f09877e71db93f25f598d3dd653776f8f /sys/arch/armv7/exynos | |
| parent | 771a78c80dc5bd514edb334a37f9ab501b85ce62 (diff) | |
Only set cpuresetfn if it isn't set already such that other reboot mechanisms
(like psci or syscon) are preferred over letting the watchdog fire.
ok patrick@
Diffstat (limited to 'sys/arch/armv7/exynos')
| -rw-r--r-- | sys/arch/armv7/exynos/exdog.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/armv7/exynos/exdog.c b/sys/arch/armv7/exynos/exdog.c index ed89dfecd17..2a86d75a11d 100644 --- a/sys/arch/armv7/exynos/exdog.c +++ b/sys/arch/armv7/exynos/exdog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exdog.c,v 1.5 2017/03/04 18:17:24 kettenis Exp $ */ +/* $OpenBSD: exdog.c,v 1.6 2017/03/09 20:07:35 kettenis Exp $ */ /* * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se> * @@ -94,7 +94,8 @@ exdog_attach(struct device *parent, struct device *self, void *aux) printf("\n"); exdog_sc = sc; - cpuresetfn = exdog_reset; + if (cpuresetfn == NULL) + cpuresetfn = exdog_reset; } void |