diff options
Diffstat (limited to 'sys/arch/i386/include')
| -rw-r--r-- | sys/arch/i386/include/hibernate.h | 8 | ||||
| -rw-r--r-- | sys/arch/i386/include/hibernate_var.h | 19 |
2 files changed, 9 insertions, 18 deletions
diff --git a/sys/arch/i386/include/hibernate.h b/sys/arch/i386/include/hibernate.h index 5f3b7042eae..19c0b8dd63f 100644 --- a/sys/arch/i386/include/hibernate.h +++ b/sys/arch/i386/include/hibernate.h @@ -21,7 +21,9 @@ int get_hibernate_info_md(union hibernate_info *); void hibernate_flush(void); void hibernate_enter_resume_mapping(vaddr_t, paddr_t, int); -int hibernate_zlib_reset(int); -int hibernate_inflate_skip(paddr_t); +int hibernate_inflate_skip(union hibernate_info *, paddr_t); +void hibernate_prepare_resume_machdep(union hibernate_info *); int hibernate_suspend(void); -void hibernate_resume(void); +void hibernate_switch_stack_machdep(void); +void hibernate_resume_machdep(void); +void hibernate_activate_resume_pt_machdep(void); diff --git a/sys/arch/i386/include/hibernate_var.h b/sys/arch/i386/include/hibernate_var.h index 07a14b9836f..b34fd9395cb 100644 --- a/sys/arch/i386/include/hibernate_var.h +++ b/sys/arch/i386/include/hibernate_var.h @@ -20,15 +20,10 @@ #define PAGE_MASK_4M (NBPD - 1) #define PMAP_PA_MASK_4M ~((paddr_t)PAGE_MASK_4M) -#define HIBERNATE_STACK_PAGE (PAGE_SIZE * 5) -#define HIBERNATE_IO_PAGE (PAGE_SIZE * 6) -#define HIBERNATE_TEMP_PAGE (PAGE_SIZE * 10) -#define HIBERNATE_TEMP_PAGE2 (PAGE_SIZE * 11) -#define HIBERNATE_PD_PAGE (PAGE_SIZE * 12) -#define HIBERNATE_PT_PAGE (PAGE_SIZE * 13) -#define HIBERNATE_ALLOC_PAGE (PAGE_SIZE * 14) - -#define HIBERNATE_CHUNKS_PAGE (PAGE_SIZE * 15) +#define HIBERNATE_PD_PAGE (PAGE_SIZE * 5) +#define HIBERNATE_PT_PAGE (PAGE_SIZE * 6) +#define HIBERNATE_STACK_PAGE (PAGE_SIZE * 7) +#define HIBERNATE_INFLATE_PAGE (PAGE_SIZE * 8) /* Use 4MB hibernation chunks */ #define HIBERNATE_CHUNK_SIZE 0x400000 @@ -39,12 +34,6 @@ #define HIBERNATE_CHUNK_TABLE_SIZE (HIBERNATE_CHUNK_TABLE_END - \ HIBERNATE_CHUNK_TABLE_START) -/* 320KB (80 pages) for gzip allocator */ -#define HIBERNATE_ZLIB_SCRATCH (PAGE_SIZE * 20) -#define HIBERNATE_ZLIB_START (PAGE_SIZE * 21) -#define HIBERNATE_ZLIB_END (PAGE_SIZE * (21 + 80)) -#define HIBERNATE_ZLIB_SIZE (HIBERNATE_ZLIB_END - HIBERNATE_ZLIB_START) - #define HIBERNATE_STACK_OFFSET 0x0F00 #define atop_4m(x) ((x) >> PAGE_SHIFT_4M) |