Date: Fri, 17 Oct 2008 23:23:50 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r184004 - projects/releng_6_xen/sys/i386/xen Message-ID: <200810172323.m9HNNodf000950@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Fri Oct 17 23:23:50 2008 New Revision: 184004 URL: http://svn.freebsd.org/changeset/base/184004 Log: Don't set nkpt higher than the max required to map KVA Modified: projects/releng_6_xen/sys/i386/xen/xen_machdep.c Modified: projects/releng_6_xen/sys/i386/xen/xen_machdep.c ============================================================================== --- projects/releng_6_xen/sys/i386/xen/xen_machdep.c Fri Oct 17 23:03:35 2008 (r184003) +++ projects/releng_6_xen/sys/i386/xen/xen_machdep.c Fri Oct 17 23:23:50 2008 (r184004) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810172323.m9HNNodf000950>