diff options
| -rw-r--r-- | sys/amd64/amd64/pmap.c | 7 | ||||
| -rw-r--r-- | sys/i386/i386/pmap.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 5a46bd3c81dd..7b673e68b5c3 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -600,10 +600,13 @@ static pt_entry_t * get_ptbase(pmap) pmap_t pmap; { - pd_entry_t frame = pmap->pm_pdir[PTDPTDI] & PG_FRAME; + pd_entry_t frame; /* are we current address space or kernel? */ - if (pmap == kernel_pmap || frame == (PTDpde & PG_FRAME)) + if (pmap == kernel_pmap) + return PTmap; + frame = pmap->pm_pdir[PTDPTDI] & PG_FRAME; + if (frame == (PTDpde & PG_FRAME)) return PTmap; /* otherwise, we are alternate address space */ if (frame != (APTDpde & PG_FRAME)) { diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 5a46bd3c81dd..7b673e68b5c3 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -600,10 +600,13 @@ static pt_entry_t * get_ptbase(pmap) pmap_t pmap; { - pd_entry_t frame = pmap->pm_pdir[PTDPTDI] & PG_FRAME; + pd_entry_t frame; /* are we current address space or kernel? */ - if (pmap == kernel_pmap || frame == (PTDpde & PG_FRAME)) + if (pmap == kernel_pmap) + return PTmap; + frame = pmap->pm_pdir[PTDPTDI] & PG_FRAME; + if (frame == (PTDpde & PG_FRAME)) return PTmap; /* otherwise, we are alternate address space */ if (frame != (APTDpde & PG_FRAME)) { |