diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2013-06-04 16:21:25 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2013-06-04 16:21:25 +0000 |
| commit | 6a0d55a443c845b3eb9bb35854556b85624aec62 (patch) | |
| tree | 82d30c67aa3e3af14bfc66c803eae937269534c4 /sys | |
| parent | d42de3ca73a676c41580e8334047ccd882045fa5 (diff) | |
Remove remaining references to HIBERNATE_COPY_PAGE. It was effectively
removed at n2k13 but a few errant references still remained. No functional
change. Spot tested by my on i386 and amd64 UP environments, no regressions
seen.
noticed by deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/amd64/acpi_wakecode.S | 3 | ||||
| -rw-r--r-- | sys/arch/amd64/include/hibernate_var.h | 5 | ||||
| -rw-r--r-- | sys/arch/i386/i386/acpi_wakecode.S | 1 | ||||
| -rw-r--r-- | sys/arch/i386/include/hibernate_var.h | 5 |
4 files changed, 5 insertions, 9 deletions
diff --git a/sys/arch/amd64/amd64/acpi_wakecode.S b/sys/arch/amd64/amd64/acpi_wakecode.S index 30e413f340f..20ce42624d7 100644 --- a/sys/arch/amd64/amd64/acpi_wakecode.S +++ b/sys/arch/amd64/amd64/acpi_wakecode.S @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi_wakecode.S,v 1.17 2013/06/01 17:16:51 mlarkin Exp $ */ +/* $OpenBSD: acpi_wakecode.S,v 1.18 2013/06/04 16:21:23 mlarkin Exp $ */ /* * Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org> * Copyright (c) 2001 Mitsuru IWASAKI <iwasaki@jp.freebsd.org> @@ -492,7 +492,6 @@ NENTRY(hibernate_switch_stack_machdep) NENTRY(hibernate_flush) wbinvd invlpg HIBERNATE_INFLATE_PAGE - invlpg HIBERNATE_COPY_PAGE ret #endif /* HIBERNATE */ diff --git a/sys/arch/amd64/include/hibernate_var.h b/sys/arch/amd64/include/hibernate_var.h index 28fccc48ba6..0c98de261ff 100644 --- a/sys/arch/amd64/include/hibernate_var.h +++ b/sys/arch/amd64/include/hibernate_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hibernate_var.h,v 1.5 2013/06/04 01:20:23 pirofti Exp $ */ +/* $OpenBSD: hibernate_var.h,v 1.6 2013/06/04 16:21:23 mlarkin Exp $ */ /* * Copyright (c) 2011 Mike Larkin <mlarkin@openbsd.org> @@ -60,9 +60,8 @@ #define HIBERNATE_STACK_PAGE (PAGE_SIZE * 17) #define HIBERNATE_INFLATE_PAGE (PAGE_SIZE * 18) -#define HIBERNATE_COPY_PAGE (PAGE_SIZE * 19) /* HIBERNATE_HIBALLOC_PAGE must be the last stolen page (see machdep.c) */ -#define HIBERNATE_HIBALLOC_PAGE (PAGE_SIZE * 20) +#define HIBERNATE_HIBALLOC_PAGE (PAGE_SIZE * 19) /* Use 4MB hibernation chunks */ #define HIBERNATE_CHUNK_SIZE 0x400000 diff --git a/sys/arch/i386/i386/acpi_wakecode.S b/sys/arch/i386/i386/acpi_wakecode.S index 99ab5326bb2..0da8880ebf4 100644 --- a/sys/arch/i386/i386/acpi_wakecode.S +++ b/sys/arch/i386/i386/acpi_wakecode.S @@ -397,7 +397,6 @@ NENTRY(hibernate_switch_stack_machdep) NENTRY(hibernate_flush) wbinvd invlpg HIBERNATE_INFLATE_PAGE - invlpg HIBERNATE_COPY_PAGE ret #endif /* HIBERNATE */ diff --git a/sys/arch/i386/include/hibernate_var.h b/sys/arch/i386/include/hibernate_var.h index e019765e4a1..41dba7b502c 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.7 2013/06/04 01:20:23 pirofti Exp $ */ +/* $OpenBSD: hibernate_var.h,v 1.8 2013/06/04 16:21:24 mlarkin Exp $ */ /* * Copyright (c) 2011 Mike Larkin <mlarkin@openbsd.org> @@ -28,8 +28,7 @@ #define HIBERNATE_PT_PAGE (PAGE_SIZE * 6) #define HIBERNATE_STACK_PAGE (PAGE_SIZE * 8) #define HIBERNATE_INFLATE_PAGE (PAGE_SIZE * 9) -#define HIBERNATE_COPY_PAGE (PAGE_SIZE * 10) -#define HIBERNATE_HIBALLOC_PAGE (PAGE_SIZE * 11) +#define HIBERNATE_HIBALLOC_PAGE (PAGE_SIZE * 10) /* Use 4MB hibernation chunks */ #define HIBERNATE_CHUNK_SIZE 0x400000 |