summaryrefslogtreecommitdiffstats
path: root/sys/kern/subr_hibernate.c
diff options
context:
space:
mode:
authormlarkin <mlarkin@openbsd.org>2014-02-01 07:10:33 +0000
committermlarkin <mlarkin@openbsd.org>2014-02-01 07:10:33 +0000
commitdc6189dd2bf36d1aa6817078d4596c7c66870eb1 (patch)
treeaf7112be3946a2c2cbf95ef708ca226059ed6169 /sys/kern/subr_hibernate.c
parentSplit bge(4)'s feature flags into bge_flags and bge_phy_flags. (diff)
downloadwireguard-openbsd-dc6189dd2bf36d1aa6817078d4596c7c66870eb1.tar.xz
wireguard-openbsd-dc6189dd2bf36d1aa6817078d4596c7c66870eb1.zip
Remove some of the excessive cache and TLB flushing going on during
hibernate unpack - these were added a while ago when we were fighting different issues that have now been solved. Tested by myself and dcoppa on a variety of machines
Diffstat (limited to 'sys/kern/subr_hibernate.c')
-rw-r--r--sys/kern/subr_hibernate.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/kern/subr_hibernate.c b/sys/kern/subr_hibernate.c
index 09e9f397498..147a3e1803b 100644
--- a/sys/kern/subr_hibernate.c
+++ b/sys/kern/subr_hibernate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_hibernate.c,v 1.83 2014/01/21 01:48:44 tedu Exp $ */
+/* $OpenBSD: subr_hibernate.c,v 1.84 2014/02/01 07:10:33 mlarkin Exp $ */
/*
* Copyright (c) 2011 Ariane van der Steldt <ariane@stack.nl>
@@ -825,9 +825,6 @@ hibernate_inflate_region(union hibernate_info *hib, paddr_t dest,
hibernate_state->hib_stream.avail_in = size;
do {
- /* Flush cache and TLB */
- hibernate_flush();
-
/*
* Is this a special page? If yes, redirect the
* inflate output to a scratch page (eg, discard it)
@@ -1269,7 +1266,6 @@ hibernate_copy_chunk_to_piglet(paddr_t img_cur, vaddr_t piglet, size_t size)
src += ct;
dest += ct;
}
- wbinvd();
/* Copy remaining pages */
while (src < size + img_cur) {
@@ -1281,9 +1277,6 @@ hibernate_copy_chunk_to_piglet(paddr_t img_cur, vaddr_t piglet, size_t size)
src += ct;
dest += ct;
}
-
- hibernate_flush();
- wbinvd();
}
/*