diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2013-05-30 19:01:00 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2013-05-30 19:01:00 +0000 |
| commit | edf8c961298998e5e08119935c4a6f6058cd42a1 (patch) | |
| tree | 9c91415f91dfe7264afe5f4dd45ca2945d815fe9 /sys/kern | |
| parent | 2452957742018723be8e627e578608232eb75b00 (diff) | |
Make interrupt handling in hibernate resume MI by providing MD-specific
functions to enable and disable interrupts, if needed. If a platform doesnt
need interrupt handling in this way, the MD function can be a no-op.
discussed with pirofti and deraadt
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_hibernate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/subr_hibernate.c b/sys/kern/subr_hibernate.c index fb22acdf579..c195ed81c95 100644 --- a/sys/kern/subr_hibernate.c +++ b/sys/kern/subr_hibernate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_hibernate.c,v 1.55 2013/05/30 16:00:54 mlarkin Exp $ */ +/* $OpenBSD: subr_hibernate.c,v 1.56 2013/05/30 19:00:59 mlarkin Exp $ */ /* * Copyright (c) 2011 Ariane van der Steldt <ariane@stack.nl> @@ -1197,12 +1197,12 @@ hibernate_resume(void) goto fail; (void) splhigh(); - disable_intr(); + hibernate_disable_intr_machdep(); cold = 1; if (config_suspend(TAILQ_FIRST(&alldevs), DVACT_SUSPEND) != 0) { cold = 0; - enable_intr(); + hibernate_enable_intr_machdep(); goto fail; } |