diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-11-01 07:08:44 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-11-01 07:08:44 +0000 |
| commit | b40fe96353f706b74657eb1e965b985c6898ba84 (patch) | |
| tree | 97ba85f9af5fdcc736ead3109c2a6c2a1eb89ddc /sys/arch/armv7/sunxi | |
| parent | 67c447ae229fbd2cd32bc3c9841e5fa21b0de5a3 (diff) | |
Now the armv7 ramdisks are compiled with SMALL_KERNEL
the omap and sunxi ramdisks won't build because they
call wdog_register() and kern_watchdog.c is !small_kernel
in config.
Leaving the watchdog devices out of the ramdisks won't
work either as armv7_machdep.c uses platform_watchdog_reset()
to reboot.
Deal with this by only calling wdog_register() when
not compiled with SMALL_KERNEL.
Diffstat (limited to 'sys/arch/armv7/sunxi')
| -rw-r--r-- | sys/arch/armv7/sunxi/sxidog.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/armv7/sunxi/sxidog.c b/sys/arch/armv7/sunxi/sxidog.c index 9dfef879603..ab327ddb6fb 100644 --- a/sys/arch/armv7/sunxi/sxidog.c +++ b/sys/arch/armv7/sunxi/sxidog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sxidog.c,v 1.3 2013/11/06 19:03:07 syl Exp $ */ +/* $OpenBSD: sxidog.c,v 1.4 2014/11/01 07:08:43 jsg Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -101,7 +101,9 @@ sxidog_attach(struct device *parent, struct device *self, void *args) #endif sxidog_sc = sc; +#ifndef SMALL_KERNEL wdog_register(sxidog_callback, sc); +#endif printf("\n"); } |