diff options
| author |   mlarkin <mlarkin@openbsd.org> | 2014-06-11 00:30:25 +0000 |
|---|---|---|
| committer | mlarkin <mlarkin@openbsd.org> | 2014-06-11 00:30:25 +0000 |
| commit | 176c7af6b0f5683ab0fbd05ac33d017d1fae9d18 (patch) | |
| tree | 99d5ce389680e8a19d3cd8b395e56c42647b2175 | |
| parent | Fix off by one when writing FAT for FAT12 filesystems. (diff) | |
| download | wireguard-openbsd-176c7af6b0f5683ab0fbd05ac33d017d1fae9d18.tar.xz wireguard-openbsd-176c7af6b0f5683ab0fbd05ac33d017d1fae9d18.zip | |
Don't map phys pages < 64KB in the resume page table. We stopped doing this
in the kernel a few months back and there's no reason these pages need to
be mapped during unpack either.
| -rw-r--r-- | sys/arch/amd64/amd64/hibernate_machdep.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/i386/hibernate_machdep.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/amd64/amd64/hibernate_machdep.c b/sys/arch/amd64/amd64/hibernate_machdep.c index a4f4a6c666a..33c695e9c3a 100644 --- a/sys/arch/amd64/amd64/hibernate_machdep.c +++ b/sys/arch/amd64/amd64/hibernate_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hibernate_machdep.c,v 1.20 2014/05/31 06:30:16 mlarkin Exp $ */ +/* $OpenBSD: hibernate_machdep.c,v 1.21 2014/06/11 00:30:25 mlarkin Exp $ */ /* * Copyright (c) 2012 Mike Larkin <mlarkin@openbsd.org> @@ -282,10 +282,10 @@ hibernate_populate_resume_pt(union hibernate_info *hib_info, *pde = npde; /* - * Identity map first 640KB physical for tramps and special utility + * Identity map 64KB-640KB physical for tramps and special utility * pages using 4KB mappings */ - for (i = 0; i < 160; i ++) { + for (i = 16; i < 160; i ++) { hibernate_enter_resume_mapping(i*PAGE_SIZE, i*PAGE_SIZE, 0); } diff --git a/sys/arch/i386/i386/hibernate_machdep.c b/sys/arch/i386/i386/hibernate_machdep.c index b65b42c8321..932f7b89417 100644 --- a/sys/arch/i386/i386/hibernate_machdep.c +++ b/sys/arch/i386/i386/hibernate_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hibernate_machdep.c,v 1.30 2014/05/31 06:30:16 mlarkin Exp $ */ +/* $OpenBSD: hibernate_machdep.c,v 1.31 2014/06/11 00:30:25 mlarkin Exp $ */ /* * Copyright (c) 2011 Mike Larkin <mlarkin@openbsd.org> @@ -217,10 +217,10 @@ hibernate_populate_resume_pt(union hibernate_info *hib_info, hibernate_enter_resume_4k_pde(0); /* - * Identity map first 640KB physical for tramps and special utility + * Identity map 64KB-640KB physical for tramps and special utility * pages using 4KB mappings */ - for (i = 0; i < 160; i ++) { + for (i = 16; i < 160; i ++) { hibernate_enter_resume_mapping(i*PAGE_SIZE, i*PAGE_SIZE, 0); } |