summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/i386/i386/esm.c4
-rw-r--r--sys/arch/i386/pci/elan520.c4
-rw-r--r--sys/arch/i386/pci/geodesc.c4
-rw-r--r--sys/arch/sgi/localbus/imc.c4
-rw-r--r--sys/arch/sparc64/dev/lom.c4
-rw-r--r--sys/arch/sparc64/dev/pmc.c4
-rw-r--r--sys/dev/ipmi.c4
-rw-r--r--sys/dev/isa/fins.c4
-rw-r--r--sys/dev/isa/it.c4
-rw-r--r--sys/dev/isa/sch311x.c4
-rw-r--r--sys/dev/isa/viasio.c4
-rw-r--r--sys/dev/pci/berkwdt.c4
-rw-r--r--sys/dev/pci/glxpcib.c4
-rw-r--r--sys/dev/pci/ichwdt.c4
-rw-r--r--sys/dev/pci/pwdog.c4
-rw-r--r--sys/dev/pci/tcpcib.c4
-rw-r--r--sys/dev/pci/wdt.c4
-rw-r--r--sys/kern/kern_watchdog.c11
-rw-r--r--sys/sys/systm.h5
19 files changed, 42 insertions, 42 deletions
diff --git a/sys/arch/i386/i386/esm.c b/sys/arch/i386/i386/esm.c
index 579416495a3..c90b2c42aa1 100644
--- a/sys/arch/i386/i386/esm.c
+++ b/sys/arch/i386/i386/esm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esm.c,v 1.52 2010/07/02 01:35:13 tedu Exp $ */
+/* $OpenBSD: esm.c,v 1.53 2012/10/17 22:31:59 deraadt Exp $ */
/*
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -253,7 +253,7 @@ esm_attach(struct device *parent, struct device *self, void *aux)
}
sc->sc_wdog_period = 0;
- wdog_register(sc, esm_watchdog);
+ wdog_register(esm_watchdog, sc);
printf("\n");
strlcpy(sc->sc_sensordev.xname, DEVNAME(sc),
diff --git a/sys/arch/i386/pci/elan520.c b/sys/arch/i386/pci/elan520.c
index a0c57db6e43..3bf5acbb6e9 100644
--- a/sys/arch/i386/pci/elan520.c
+++ b/sys/arch/i386/pci/elan520.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: elan520.c,v 1.17 2010/04/20 22:05:41 tedu Exp $ */
+/* $OpenBSD: elan520.c,v 1.18 2012/10/17 22:32:01 deraadt Exp $ */
/* $NetBSD: elan520.c,v 1.4 2002/10/02 05:47:15 thorpej Exp $ */
/*-
@@ -157,7 +157,7 @@ elansc_attach(struct device *parent, struct device *self, void *aux)
/* ...and clear it. */
elansc_wdogctl_reset(sc);
- wdog_register(sc, elansc_wdogctl_cb);
+ wdog_register(elansc_wdogctl_cb, sc);
elansc = sc;
cpu_setperf = elansc_setperf;
cpu_cpuspeed = elansc_cpuspeed;
diff --git a/sys/arch/i386/pci/geodesc.c b/sys/arch/i386/pci/geodesc.c
index b9e74f84564..3594aa313a6 100644
--- a/sys/arch/i386/pci/geodesc.c
+++ b/sys/arch/i386/pci/geodesc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: geodesc.c,v 1.10 2012/08/16 18:42:04 tedu Exp $ */
+/* $OpenBSD: geodesc.c,v 1.11 2012/10/17 22:32:01 deraadt Exp $ */
/*
* Copyright (c) 2003 Markus Friedl <markus@openbsd.org>
@@ -120,7 +120,7 @@ geodesc_attach(struct device *parent, struct device *self, void *aux)
cnfg |= WDTYPE1_RESET|WDPRES_DIV_512;
bus_space_write_2(sc->sc_iot, sc->sc_ioh, GCB_WDCNFG, cnfg);
- wdog_register(sc, geodesc_wdogctl_cb);
+ wdog_register(geodesc_wdogctl_cb, sc);
#endif /* SMALL_KERNEL */
bus_space_write_4(sc->sc_iot, sc->sc_ioh, GCB_TSCNFG, TSC_ENABLE);
diff --git a/sys/arch/sgi/localbus/imc.c b/sys/arch/sgi/localbus/imc.c
index c952a5cf946..0190974390d 100644
--- a/sys/arch/sgi/localbus/imc.c
+++ b/sys/arch/sgi/localbus/imc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imc.c,v 1.12 2012/10/03 11:18:23 miod Exp $ */
+/* $OpenBSD: imc.c,v 1.13 2012/10/17 22:32:01 deraadt Exp $ */
/* $NetBSD: imc.c,v 1.32 2011/07/01 18:53:46 dyoung Exp $ */
/*
@@ -684,7 +684,7 @@ imc_attach(struct device *parent, struct device *self, void *aux)
#endif
/* Register watchdog */
- wdog_register(self, imc_watchdog_cb);
+ wdog_register(imc_watchdog_cb, self);
}
int
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
diff --git a/sys/dev/ipmi.c b/sys/dev/ipmi.c
index dd4c8c177ae..8e0705c9365 100644
--- a/sys/dev/ipmi.c
+++ b/sys/dev/ipmi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipmi.c,v 1.65 2010/05/24 14:25:20 deraadt Exp $ */
+/* $OpenBSD: ipmi.c,v 1.66 2012/10/17 22:32:01 deraadt Exp $ */
/*
* Copyright (c) 2005 Jordan Hargrave
@@ -1744,7 +1744,7 @@ ipmi_attach(struct device *parent, struct device *self, void *aux)
/* Setup Watchdog timer */
sc->sc_wdog_period = 0;
- wdog_register(sc, ipmi_watchdog);
+ wdog_register(ipmi_watchdog, sc);
/* lock around read_sensor so that no one messes with the bmc regs */
rw_init(&sc->sc_lock, DEVNAME(sc));
diff --git a/sys/dev/isa/fins.c b/sys/dev/isa/fins.c
index bf4ae3d2fc9..af5087fb17e 100644
--- a/sys/dev/isa/fins.c
+++ b/sys/dev/isa/fins.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fins.c,v 1.2 2009/03/30 00:36:26 deraadt Exp $ */
+/* $OpenBSD: fins.c,v 1.3 2012/10/17 22:32:01 deraadt Exp $ */
/*
* Copyright (c) 2005, 2006 Mark Kettenis
@@ -300,7 +300,7 @@ fins_attach(struct device *parent, struct device *self, void *aux)
sc->fins_wdog_cr = fins_read_wdog(sc, FINS_WDOG_CR1);
sc->fins_wdog_cr &= ~(FINS_WDOG_MINS | FINS_WDOG_EN);
fins_write_wdog(sc, FINS_WDOG_CR1, sc->fins_wdog_cr);
- wdog_register(sc, fins_wdog_cb);
+ wdog_register(fins_wdog_cb, sc);
attach_done:
printf("\n");
}
diff --git a/sys/dev/isa/it.c b/sys/dev/isa/it.c
index bed72d7e166..92d34bd3c42 100644
--- a/sys/dev/isa/it.c
+++ b/sys/dev/isa/it.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: it.c,v 1.40 2011/01/20 16:59:55 form Exp $ */
+/* $OpenBSD: it.c,v 1.41 2012/10/17 22:32:01 deraadt Exp $ */
/*
* Copyright (c) 2007-2008 Oleg Safiullin <form@pdp-11.org.ru>
@@ -229,7 +229,7 @@ it_attach(struct device *parent, struct device *self, void *aux)
it_writereg(sc->sc_iot, sc->sc_ioh, IT_LDN, IT_WDT_LDN);
it_writereg(sc->sc_iot, sc->sc_ioh, IT_WDT_CSR, 0x00);
it_writereg(sc->sc_iot, sc->sc_ioh, IT_WDT_TCR, 0x00);
- wdog_register(sc, it_wdog_cb);
+ wdog_register(it_wdog_cb, sc);
}
/* exit MB PnP mode and unmap */
diff --git a/sys/dev/isa/sch311x.c b/sys/dev/isa/sch311x.c
index 64c2f7e0e06..87cd1da851e 100644
--- a/sys/dev/isa/sch311x.c
+++ b/sys/dev/isa/sch311x.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sch311x.c,v 1.12 2009/08/22 03:51:07 mk Exp $ */
+/* $OpenBSD: sch311x.c,v 1.13 2012/10/17 22:32:01 deraadt Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org>
* Copyright (c) 2009 Michael Knudsen <mk@openbsd.org>
@@ -487,7 +487,7 @@ schsio_wdt_init(struct schsio_softc *sc)
reg &= ~(SCHSIO_WDT_CFG_MSEN | SCHSIO_WDT_CFG_MSEN);
bus_space_write_1(sc->sc_iot, sc->sc_ioh_rr, SCHSIO_WDT_CFG, reg);
- wdog_register(sc, schsio_wdt_cb);
+ wdog_register(schsio_wdt_cb, sc);
}
int
diff --git a/sys/dev/isa/viasio.c b/sys/dev/isa/viasio.c
index 08be95cd50e..3b82c46ded5 100644
--- a/sys/dev/isa/viasio.c
+++ b/sys/dev/isa/viasio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: viasio.c,v 1.12 2009/03/29 21:53:52 sthen Exp $ */
+/* $OpenBSD: viasio.c,v 1.13 2012/10/17 22:32:01 deraadt Exp $ */
/*
* Copyright (c) 2005 Alexander Yurchenko <grange@openbsd.org>
*
@@ -478,7 +478,7 @@ viasio_wdg_init(struct viasio_softc *sc)
}
/* Register new watchdog */
- wdog_register(sc, viasio_wdg_cb);
+ wdog_register(viasio_wdg_cb, sc);
}
int
diff --git a/sys/dev/pci/berkwdt.c b/sys/dev/pci/berkwdt.c
index c3b5d42f2da..47eaaa1c593 100644
--- a/sys/dev/pci/berkwdt.c
+++ b/sys/dev/pci/berkwdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: berkwdt.c,v 1.6 2010/04/08 00:23:53 tedu Exp $ */
+/* $OpenBSD: berkwdt.c,v 1.7 2012/10/17 22:32:01 deraadt Exp $ */
/*
* Copyright (c) 2009 Wim Van Sebroeck <wim@iguana.be>
@@ -210,7 +210,7 @@ berkwdt_attach(struct device *parent, struct device *self, void *aux)
sc->sc_period = 0;
/* register with the watchdog framework */
- wdog_register(sc, berkwdt_set_timeout);
+ wdog_register(berkwdt_set_timeout, sc);
}
int
diff --git a/sys/dev/pci/glxpcib.c b/sys/dev/pci/glxpcib.c
index 30a4dcde277..9f89180cde7 100644
--- a/sys/dev/pci/glxpcib.c
+++ b/sys/dev/pci/glxpcib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: glxpcib.c,v 1.6 2012/10/08 21:47:50 deraadt Exp $ */
+/* $OpenBSD: glxpcib.c,v 1.7 2012/10/17 22:32:01 deraadt Exp $ */
/*
* Copyright (c) 2007 Marc Balmer <mbalmer@openbsd.org>
@@ -301,7 +301,7 @@ glxpcib_attach(struct device *parent, struct device *self, void *aux)
bus_space_write_2(sc->sc_iot, sc->sc_ioh, AMD5536_MFGPT0_SETUP,
AMD5536_MFGPT_CNT_EN | AMD5536_MFGPT_CMP2EV |
AMD5536_MFGPT_CMP2 | AMD5536_MFGPT_DIV_MASK);
- wdog_register(sc, glxpcib_wdogctl_cb);
+ wdog_register(glxpcib_wdogctl_cb, sc);
sc->sc_wdog = 1;
printf(", watchdog");
}
diff --git a/sys/dev/pci/ichwdt.c b/sys/dev/pci/ichwdt.c
index a6000205b48..2d690932bdc 100644
--- a/sys/dev/pci/ichwdt.c
+++ b/sys/dev/pci/ichwdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ichwdt.c,v 1.3 2009/03/29 21:53:52 sthen Exp $ */
+/* $OpenBSD: ichwdt.c,v 1.4 2012/10/17 22:32:01 deraadt Exp $ */
/*
* Copyright (c) 2004, 2005 Alexander Yurchenko <grange@openbsd.org>
@@ -136,7 +136,7 @@ ichwdt_attach(struct device *parent, struct device *self, void *aux)
printf("\n");
/* Register new watchdog */
- wdog_register(sc, ichwdt_cb);
+ wdog_register(ichwdt_cb, sc);
}
int
diff --git a/sys/dev/pci/pwdog.c b/sys/dev/pci/pwdog.c
index 8d5f65f7bc2..c95d9aeb116 100644
--- a/sys/dev/pci/pwdog.c
+++ b/sys/dev/pci/pwdog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pwdog.c,v 1.7 2010/04/08 00:23:53 tedu Exp $ */
+/* $OpenBSD: pwdog.c,v 1.8 2012/10/17 22:32:01 deraadt Exp $ */
/*
* Copyright (c) 2006 Marc Balmer <mbalmer@openbsd.org>
@@ -79,7 +79,7 @@ pwdog_attach(struct device *parent, struct device *self, void *aux)
}
printf("\n");
bus_space_write_1(pwdog->iot, pwdog->ioh, PWDOG_DISABLE, 0);
- wdog_register(pwdog, pwdog_set_timeout);
+ wdog_register(pwdog_set_timeout, pwdog);
}
int
diff --git a/sys/dev/pci/tcpcib.c b/sys/dev/pci/tcpcib.c
index 906f2354e19..3f8386c78db 100644
--- a/sys/dev/pci/tcpcib.c
+++ b/sys/dev/pci/tcpcib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcpcib.c,v 1.3 2012/06/04 20:08:10 kettenis Exp $ */
+/* $OpenBSD: tcpcib.c,v 1.4 2012/10/17 22:32:01 deraadt Exp $ */
/*
* Copyright (c) 2012 Matt Dainty <matt@bodgit-n-scarper.com>
@@ -257,7 +257,7 @@ tcpcib_attach(struct device *parent, struct device *self, void *aux)
sc->sc_active |= E600_WDT_ACTIVE;
/* Register new watchdog */
- wdog_register(sc, tcpcib_wdt_cb);
+ wdog_register(tcpcib_wdt_cb, sc);
}
corepcib:
diff --git a/sys/dev/pci/wdt.c b/sys/dev/pci/wdt.c
index b19cdab91e0..2b48fe304f2 100644
--- a/sys/dev/pci/wdt.c
+++ b/sys/dev/pci/wdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdt.c,v 1.20 2011/04/03 15:36:03 jasper Exp $ */
+/* $OpenBSD: wdt.c,v 1.21 2012/10/17 22:32:01 deraadt Exp $ */
/*-
* Copyright (c) 1998,1999 Alex Nash
@@ -156,7 +156,7 @@ wdt_attach(struct device *parent, struct device *self, void *aux)
/*
* register with the watchdog framework
*/
- wdog_register(wdt, wdt_set_timeout);
+ wdog_register(wdt_set_timeout, wdt);
}
/*
diff --git a/sys/kern/kern_watchdog.c b/sys/kern/kern_watchdog.c
index af2fc703afb..3670e0932ef 100644
--- a/sys/kern/kern_watchdog.c
+++ b/sys/kern/kern_watchdog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_watchdog.c,v 1.8 2010/04/20 22:05:43 tedu Exp $ */
+/* $OpenBSD: kern_watchdog.c,v 1.9 2012/10/17 22:32:01 deraadt Exp $ */
/*
* Copyright (c) 2003 Markus Friedl. All rights reserved.
@@ -31,7 +31,6 @@
#include <sys/time.h>
void wdog_tickle(void *arg);
-void wdog_shutdown(void *arg);
int (*wdog_ctl_cb)(void *, int) = NULL;
void *wdog_ctl_cb_arg = NULL;
int wdog_period = 0;
@@ -40,7 +39,7 @@ void *wdog_cookie;
struct timeout wdog_timeout;
void
-wdog_register(void *cb_arg, int (*cb)(void *, int))
+wdog_register(int (*cb)(void *, int), void *cb_arg)
{
if (wdog_ctl_cb != NULL)
return;
@@ -48,7 +47,7 @@ wdog_register(void *cb_arg, int (*cb)(void *, int))
wdog_ctl_cb = cb;
wdog_ctl_cb_arg = cb_arg;
timeout_set(&wdog_timeout, wdog_tickle, NULL);
- wdog_cookie = shutdownhook_establish(wdog_shutdown, NULL);
+ wdog_cookie = shutdownhook_establish((void (*)(void *))wdog_shutdown, NULL);
}
void
@@ -61,7 +60,7 @@ wdog_tickle(void *arg)
}
void
-wdog_shutdown(void *arg)
+wdog_shutdown(int (*cb)(void *, int), void *cb_arg)
{
if (wdog_ctl_cb == NULL)
return;
@@ -97,7 +96,7 @@ sysctl_wdog(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
if (error)
return (error);
if (wdog_auto && wdog_cookie == NULL)
- wdog_cookie = shutdownhook_establish(wdog_shutdown,
+ wdog_cookie = shutdownhook_establish((void (*)(void *))wdog_shutdown,
NULL);
else if (!wdog_auto && wdog_cookie) {
shutdownhook_disestablish(wdog_cookie);
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 90f1fe4de6f..dd3823db0c8 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: systm.h,v 1.93 2012/09/26 00:09:48 brad Exp $ */
+/* $OpenBSD: systm.h,v 1.94 2012/10/17 22:32:01 deraadt Exp $ */
/* $NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $ */
/*-
@@ -257,7 +257,8 @@ int tsleep(const volatile void *, int, const char *, int);
int msleep(const volatile void *, struct mutex *, int, const char*, int);
void yield(void);
-void wdog_register(void *, int (*)(void *, int));
+void wdog_register(int (*)(void *, int), void *);
+void wdog_shutdown(int (*)(void *, int), void *);
/*
* Startup/shutdown hooks. Startup hooks are functions running after
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.