diff options
| author |   deraadt <deraadt@openbsd.org> | 2012-10-17 22:31:59 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2012-10-17 22:31:59 +0000 |
| commit | 2bc62deca48d4e48b34ffa22cb9403b25aaa9c56 (patch) | |
| tree | e9d3498ac5f31b94cd2cc5b05bb47b1c1d28ceab /sys/arch/sparc64 | |
| parent | Narrow the spltty/splx pair in com_activate to only enclose the minimum (diff) | |
| download | wireguard-openbsd-2bc62deca48d4e48b34ffa22cb9403b25aaa9c56.tar.xz wireguard-openbsd-2bc62deca48d4e48b34ffa22cb9403b25aaa9c56.zip | |
Swap arguments to wdog_register() since it is nicer, and prepare
wdog_shutdown() for external usage.
Diffstat (limited to 'sys/arch/sparc64')
| -rw-r--r-- | sys/arch/sparc64/dev/lom.c | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/pmc.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/sparc64/dev/lom.c b/sys/arch/sparc64/dev/lom.c index 35159ac65f2..a4ce57ba5e8 100644 --- a/sys/arch/sparc64/dev/lom.c +++ b/sys/arch/sparc64/dev/lom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lom.c,v 1.22 2010/05/28 10:02:44 kettenis Exp $ */ +/* $OpenBSD: lom.c,v 1.23 2012/10/17 22:32:01 deraadt Exp $ */ /* * Copyright (c) 2009 Mark Kettenis * @@ -352,7 +352,7 @@ lom_attach(struct device *parent, struct device *self, void *aux) timeout_set(&sc->sc_wdog_to, lom_wdog_pat, sc); timeout_add_sec(&sc->sc_wdog_to, LOM_WDOG_TIME_MAX / 2); - wdog_register(sc, lom_wdog_cb); + wdog_register(lom_wdog_cb, sc); printf(": %s rev %d.%d\n", sc->sc_type < LOM_LOMLITE2 ? "LOMlite" : "LOMlite2", diff --git a/sys/arch/sparc64/dev/pmc.c b/sys/arch/sparc64/dev/pmc.c index cc5b55864c5..77bd9f0ed68 100644 --- a/sys/arch/sparc64/dev/pmc.c +++ b/sys/arch/sparc64/dev/pmc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmc.c,v 1.2 2009/11/09 20:45:37 kettenis Exp $ */ +/* $OpenBSD: pmc.c,v 1.3 2012/10/17 22:32:01 deraadt Exp $ */ /* * Copyright (c) 2007 Mark Kettenis @@ -99,7 +99,7 @@ pmc_attach(struct device *parent, struct device *self, void *aux) printf("\n"); - wdog_register(sc, pmc_wdog_cb); + wdog_register(pmc_wdog_cb, sc); } int |