diff options
| author | Luiz Souza <luiz@netgate.com> | 2018-02-23 15:11:28 -0300 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2018-02-23 15:11:28 -0300 |
| commit | 71bc802f753a5002d2eca6913c7bfdfc138fb250 (patch) | |
| tree | 84747d5dde9a24c682ae80a88adc1e77b474e6e1 /sys/amd64/amd64/pmap.c | |
| parent | 94c2674aef48e20e0cf8e83e94102eee0f09b9fe (diff) | |
| parent | ee49d4c5a19918b9960cffdf0460a5cab9989625 (diff) | |
| download | FreeBSD-src-71bc802f753a5002d2eca6913c7bfdfc138fb250.zip FreeBSD-src-71bc802f753a5002d2eca6913c7bfdfc138fb250.tar.gz | |
Merge remote-tracking branch 'origin/RELENG_2_4-meltdown' into RELENG_2_4
Diffstat (limited to 'sys/amd64/amd64/pmap.c')
| -rw-r--r-- | sys/amd64/amd64/pmap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index a7ce847..69dbe96 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -2401,9 +2401,8 @@ pmap_pinit_type(pmap_t pmap, enum pmap_type pm_type, int flags) /* * allocate the page directory page */ - while ((pml4pg = vm_page_alloc(NULL, 0, VM_ALLOC_NORMAL | - VM_ALLOC_NOOBJ | VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) - VM_WAIT; + pml4pg = vm_page_alloc(NULL, 0, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ | + VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_WAITOK); pml4phys = VM_PAGE_TO_PHYS(pml4pg); pmap->pm_pml4 = (pml4_entry_t *)PHYS_TO_DMAP(pml4phys); |
