d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't set nkpt higher than the max required to map KVA

Browse Source
This commit is contained in:
kmacy 2008-10-17 23:23:50 +00:00
parent d2ed557ca3
commit 2522622e87
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/i386/xen/xen_machdep.c
View File

@ -836,8 +836,12 @@ initvalues(start_info_t *startinfo)
unsigned long i;
int ncpus;
nkpt = min(max((startinfo->nr_pages >> NPGPTD_SHIFT), nkpt),
NPGPTD*NPDEPG - KPTDI);
nkpt = min(
min(
max((startinfo->nr_pages >> NPGPTD_SHIFT), nkpt),
NPGPTD*NPDEPG - KPTDI),
(HYPERVISOR_VIRT_START - KERNBASE) >> PDRSHIFT);
#ifdef SMP
ncpus = MAXCPU;
#else
@ -973,6 +977,8 @@ initvalues(start_info_t *startinfo)
i++, cur_space += PAGE_SIZE) {
pdir = (offset + i) / NPDEPG;
curoffset = ((offset + i) % NPDEPG);
if (((offset + i) << PDRSHIFT) == VM_MAX_KERNEL_ADDRESS)
break;
/*
* make sure that all the initial page table pages