diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2015-08-21 07:01:39 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2015-08-21 07:01:39 +0000 |
| commit | f1992fcaf23a70114a28d88a28a5e22692a038c6 (patch) | |
| tree | b0ca82769e80f7ca7ab28e3c4302135fd222f0cf /sys/arch | |
| parent | b1f101f50cfdad0eedebb9ba5305f9bc14adfd5b (diff) | |
use vaddr_t for kernel va range calculation instead of paddr_t. No binary
change but using paddr_t here wasn't correct - better to clean it up.
Diffstat (limited to 'sys/arch')
| -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 37b57d8ec8c..e9cdcf79312 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.37 2015/05/05 02:13:46 guenther Exp $ */ +/* $OpenBSD: hibernate_machdep.c,v 1.38 2015/08/21 07:01:38 mlarkin Exp $ */ /* * Copyright (c) 2012 Mike Larkin <mlarkin@openbsd.org> @@ -349,8 +349,8 @@ hibernate_populate_resume_pt(union hibernate_info *hib_info, /* * Map current kernel VA range using 2MB pages */ - kern_start_2m_va = (paddr_t)&start & ~(PAGE_MASK_L2); - kern_end_2m_va = (paddr_t)&end & ~(PAGE_MASK_L2); + kern_start_2m_va = (vaddr_t)&start & ~(PAGE_MASK_L2); + kern_end_2m_va = (vaddr_t)&end & ~(PAGE_MASK_L2); /* amd64 kernels load at 16MB phys (on the 8th 2mb page) */ phys_page_number = 8; diff --git a/sys/arch/i386/i386/hibernate_machdep.c b/sys/arch/i386/i386/hibernate_machdep.c index c76850d1081..13cc3ffa679 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.46 2015/04/26 11:09:32 kettenis Exp $ */ +/* $OpenBSD: hibernate_machdep.c,v 1.47 2015/08/21 07:01:38 mlarkin Exp $ */ /* * Copyright (c) 2011 Mike Larkin <mlarkin@openbsd.org> @@ -269,8 +269,8 @@ hibernate_populate_resume_pt(union hibernate_info *hib_info, /* * Map current kernel VA range using 4M pages */ - kern_start_4m_va = (paddr_t)&start & ~(PAGE_MASK_L2); - kern_end_4m_va = (paddr_t)&end & ~(PAGE_MASK_L2); + kern_start_4m_va = (vaddr_t)&start & ~(PAGE_MASK_L2); + kern_end_4m_va = (vaddr_t)&end & ~(PAGE_MASK_L2); /* i386 kernels load at 2MB phys (on the 0th 4mb page) */ phys_page_number = 0; |