diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2014-12-08 07:12:38 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2014-12-08 07:12:38 +0000 |
| commit | 96e518569e7f3ca4731e4b9ecba26dfa13635b8d (patch) | |
| tree | b1c3c9b290f562c2af5c0a387841cd86e46b3b24 /sys/arch/i386 | |
| parent | beccf532063cfbd43373734788e7a3fab89165fd (diff) | |
Split the ACPI resume trampoline into code and data, move the data page to
.rodata (kernel copies to the RW page), protect the code page with RX
permissions, protect the code page with RW permissions.
ok deraadt@
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/include/hibernate_var.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/i386/include/hibernate_var.h b/sys/arch/i386/include/hibernate_var.h index 6dc69e280c4..0fe75131ae4 100644 --- a/sys/arch/i386/include/hibernate_var.h +++ b/sys/arch/i386/include/hibernate_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hibernate_var.h,v 1.11 2014/11/22 20:09:36 mlarkin Exp $ */ +/* $OpenBSD: hibernate_var.h,v 1.12 2014/12/08 07:12:37 mlarkin Exp $ */ /* * Copyright (c) 2011 Mike Larkin <mlarkin@openbsd.org> @@ -18,13 +18,13 @@ #define PIGLET_PAGE_MASK (PD_MASK) -#define HIBERNATE_PD_PAGE (PAGE_SIZE * 20) -#define HIBERNATE_PT_PAGE (PAGE_SIZE * 21) +#define HIBERNATE_PD_PAGE (PAGE_SIZE * 21) +#define HIBERNATE_PT_PAGE (PAGE_SIZE * 22) /* 2 pages for stack */ -#define HIBERNATE_STACK_PAGE (PAGE_SIZE * 23) -#define HIBERNATE_INFLATE_PAGE (PAGE_SIZE * 24) +#define HIBERNATE_STACK_PAGE (PAGE_SIZE * 24) +#define HIBERNATE_INFLATE_PAGE (PAGE_SIZE * 25) /* HIBERNATE_HIBALLOC_PAGE must be the last stolen page (see machdep.c) */ -#define HIBERNATE_HIBALLOC_PAGE (PAGE_SIZE * 25) +#define HIBERNATE_HIBALLOC_PAGE (PAGE_SIZE * 26) /* Use 4MB hibernation chunks */ #define HIBERNATE_CHUNK_SIZE 0x400000 |