diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2022-01-16 22:27:47 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2022-01-16 22:27:47 +0000 |
| commit | abddde8b2fae2751c4c6f4ad593f962fee085510 (patch) | |
| tree | d815eff5ab7848cb7d5523b09558febdc95dead4 /sys/arch | |
| parent | 683b5e6df577eba3a9c0c9f7b8237e6fb3343c2f (diff) | |
Remove trailing whitespace in a few places. No code change.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/amd64/hibernate_machdep.c | 10 | ||||
| -rw-r--r-- | sys/arch/i386/i386/hibernate_machdep.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/amd64/amd64/hibernate_machdep.c b/sys/arch/amd64/amd64/hibernate_machdep.c index 0d2f40fc258..7781507fa7c 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.46 2020/09/11 09:27:09 mpi Exp $ */ +/* $OpenBSD: hibernate_machdep.c,v 1.47 2022/01/16 22:27:46 mlarkin Exp $ */ /* * Copyright (c) 2012 Mike Larkin <mlarkin@openbsd.org> @@ -198,7 +198,7 @@ get_hibernate_info_md(union hibernate_info *hiber_info) if (hiber_info->nranges >= VM_PHYSSEG_MAX) return (1); - i = hiber_info->nranges; + i = hiber_info->nranges; hiber_info->ranges[i].base = round_page(bmp->addr); hiber_info->ranges[i].end = trunc_page(bmp->addr + bmp->size); hiber_info->image_size += hiber_info->ranges[i].end - @@ -240,7 +240,7 @@ hibernate_enter_resume_2m_pde(vaddr_t va, paddr_t pa) /* First 512GB and 1GB are already mapped */ pde = (pt_entry_t *)(HIBERNATE_PD_LOW + (pl2_pi(va) * sizeof(pt_entry_t))); - npde = (pa & PG_LGFRAME) | + npde = (pa & PG_LGFRAME) | PG_RW | PG_V | PG_M | PG_PS | PG_U; *pde = npde; } else { @@ -255,7 +255,7 @@ hibernate_enter_resume_2m_pde(vaddr_t va, paddr_t pa) (pl2_pi(va) * sizeof(pt_entry_t))); npde = (pa & PG_LGFRAME) | PG_RW | PG_V | PG_M | PG_PS | PG_U; - *pde = npde; + *pde = npde; } } else { /* First map the 512GB containing region */ @@ -353,7 +353,7 @@ hibernate_populate_resume_pt(union hibernate_info *hib_info, (pl3_pi(0) * sizeof(pt_entry_t))); npde = (HIBERNATE_PD_LOW) | PG_RW | PG_V; *pde = npde; - + /* PD for first 2MB */ pde = (pt_entry_t *)(HIBERNATE_PD_LOW + (pl2_pi(0) * sizeof(pt_entry_t))); diff --git a/sys/arch/i386/i386/hibernate_machdep.c b/sys/arch/i386/i386/hibernate_machdep.c index d303d9fd760..8c0f1eb8dcd 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.56 2020/09/11 09:27:10 mpi Exp $ */ +/* $OpenBSD: hibernate_machdep.c,v 1.57 2022/01/16 22:27:46 mlarkin Exp $ */ /* * Copyright (c) 2011 Mike Larkin <mlarkin@openbsd.org> @@ -205,7 +205,7 @@ get_hibernate_info_md(union hibernate_info *hiber_info) if (hiber_info->nranges >= VM_PHYSSEG_MAX) return (1); - i = hiber_info->nranges; + i = hiber_info->nranges; hiber_info->ranges[i].base = round_page(bmp->addr); hiber_info->ranges[i].end = trunc_page(bmp->addr + bmp->size); hiber_info->image_size += hiber_info->ranges[i].end - |