diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-09-08 21:18:16 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-09-08 21:18:16 +0000 |
| commit | 4c2a70279d3f9cd387a68e2af5bef3a4ea2cf99e (patch) | |
| tree | c0852a6dbf6f1596c8aa71131b6c7746e20ac4c0 /sys/arch | |
| parent | 0065009a25bcd9ebfdde5b4026eb95af737b6157 (diff) | |
No need for vfs_syncwait() in a bufq_quiesce() world
ok thib kettenis
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/arm/xscale/pxa2x0_apm.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/i386/apm.c | 9 | ||||
| -rw-r--r-- | sys/arch/loongson/dev/apm.c | 6 |
3 files changed, 3 insertions, 18 deletions
diff --git a/sys/arch/arm/xscale/pxa2x0_apm.c b/sys/arch/arm/xscale/pxa2x0_apm.c index d9a153c6452..e55558bdd3c 100644 --- a/sys/arch/arm/xscale/pxa2x0_apm.c +++ b/sys/arch/arm/xscale/pxa2x0_apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxa2x0_apm.c,v 1.35 2010/09/07 16:21:35 deraadt Exp $ */ +/* $OpenBSD: pxa2x0_apm.c,v 1.36 2010/09/08 21:18:14 deraadt Exp $ */ /*- * Copyright (c) 2001 Alexander Guy. All rights reserved. @@ -40,7 +40,6 @@ #include <sys/kernel.h> #include <sys/kthread.h> #include <sys/rwlock.h> -#include <sys/mount.h> /* for vfs_syncwait() */ #include <sys/proc.h> #include <sys/buf.h> #include <sys/device.h> @@ -314,9 +313,6 @@ apm_suspend(struct pxa2x0_apm_softc *sc) resettodr(); - if (cold) - vfs_syncwait(0); - if (sc->sc_suspend == NULL) pxa2x0_wakeup_config(PXA2X0_WAKEUP_ALL, 1); else diff --git a/sys/arch/i386/i386/apm.c b/sys/arch/i386/i386/apm.c index f47b1f8789b..e34b223a086 100644 --- a/sys/arch/i386/i386/apm.c +++ b/sys/arch/i386/i386/apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apm.c,v 1.91 2010/09/06 15:42:18 deraadt Exp $ */ +/* $OpenBSD: apm.c,v 1.92 2010/09/08 21:18:15 deraadt Exp $ */ /*- * Copyright (c) 1998-2001 Michael Shalayeff. All rights reserved. @@ -50,7 +50,6 @@ #include <sys/ioctl.h> #include <sys/buf.h> #include <sys/event.h> -#include <sys/mount.h> /* for vfs_syncwait() proto */ #include <machine/conf.h> #include <machine/cpu.h> @@ -332,9 +331,6 @@ apm_suspend() disable_intr(); config_suspend(TAILQ_FIRST(&alldevs), DVACT_SUSPEND); - if (cold) - vfs_syncwait(0); - (void)apm_set_powstate(APM_DEV_ALLDEVS, APM_SYS_SUSPEND); } @@ -351,9 +347,6 @@ apm_standby() disable_intr(); config_suspend(TAILQ_FIRST(&alldevs), DVACT_SUSPEND); - if (cold) - vfs_syncwait(0); - (void)apm_set_powstate(APM_DEV_ALLDEVS, APM_SYS_STANDBY); } diff --git a/sys/arch/loongson/dev/apm.c b/sys/arch/loongson/dev/apm.c index 1897af61e22..f06145887db 100644 --- a/sys/arch/loongson/dev/apm.c +++ b/sys/arch/loongson/dev/apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apm.c,v 1.6 2010/09/01 13:10:42 pirofti Exp $ */ +/* $OpenBSD: apm.c,v 1.7 2010/09/08 21:18:15 deraadt Exp $ */ /*- * Copyright (c) 2001 Alexander Guy. All rights reserved. @@ -43,7 +43,6 @@ #include <sys/ioctl.h> #include <sys/buf.h> #include <sys/event.h> -#include <sys/mount.h> #include <machine/autoconf.h> #include <machine/conf.h> @@ -380,9 +379,6 @@ apm_suspend() apm_saved_spl = splhigh(); config_suspend(TAILQ_FIRST(&alldevs), DVACT_SUSPEND); - if (cold) - vfs_syncwait(0); - return sys_platform->suspend(); } |