From 45db8bdae49f6e8caf0e7bc1694cd3665786bcf8 Mon Sep 17 00:00:00 2001 From: Stefan Sperling Date: Mon, 16 Jul 2012 12:31:16 +0000 Subject: Back out my workaround from r1.43 now that jsing has committed a better fix. --- sys/kern/subr_hibernate.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'sys/kern/subr_hibernate.c') 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 @@ -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, -- cgit v1.2.3