diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2012-07-16 12:31:16 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2012-07-16 12:31:16 +0000 |
| commit | 45db8bdae49f6e8caf0e7bc1694cd3665786bcf8 (patch) | |
| tree | d2a850460c581e3a6ba80d8ff67d8aecfb0f2b85 /sys/kern/subr_hibernate.c | |
| parent | cc4ac89c29b51f7360b2478274529cfbea6cadfd (diff) | |
Back out my workaround from r1.43 now that jsing has committed a better fix.
Diffstat (limited to 'sys/kern/subr_hibernate.c')
| -rw-r--r-- | sys/kern/subr_hibernate.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/kern/subr_hibernate.c b/sys/kern/subr_hibernate.c index abd50deeb5a..f6bb3068210 100644 --- a/sys/kern/subr_hibernate.c +++ b/sys/kern/subr_hibernate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_hibernate.c,v 1.44 2012/07/16 12:15:58 jsing Exp $ */ +/* $OpenBSD: subr_hibernate.c,v 1.45 2012/07/16 12:31:15 stsp Exp $ */ /* * Copyright (c) 2011 Ariane van der Steldt <ariane@stack.nl> @@ -1087,10 +1087,8 @@ hibernate_resume(void) if (hibernate_block_io(&hiber_info, hiber_info.sig_offset - hiber_info.swap_offset, - hiber_info.secsize, (vaddr_t)&disk_hiber_info, 0)) { - printf("error in hibernate read\n"); - goto fail; - } + hiber_info.secsize, (vaddr_t)&disk_hiber_info, 0)) + panic("error in hibernate read"); /* * If on-disk and in-memory hibernate signatures match, |