svn commit: r197700 - in stable/8/sys: . amd64/amd64
amd64/include/xen cddl/contrib/opensolaris contrib/dev/acpica
contrib/pf dev/xen/xenpci
Alan Cox
alc at FreeBSD.org
Fri Oct 2 05:11:46 UTC 2009
Author: alc
Date: Fri Oct 2 05:11:46 2009
New Revision: 197700
URL: http://svn.freebsd.org/changeset/base/197700
Log:
MFC r197580
Temporarily disable the use of 1GB page mappings by the direct map.
Approved by: re (kib)
Modified:
stable/8/sys/ (props changed)
stable/8/sys/amd64/amd64/pmap.c
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/amd64/amd64/pmap.c
==============================================================================
--- stable/8/sys/amd64/amd64/pmap.c Fri Oct 2 02:28:59 2009 (r197699)
+++ stable/8/sys/amd64/amd64/pmap.c Fri Oct 2 05:11:46 2009 (r197700)
@@ -440,7 +440,7 @@ create_pagetables(vm_paddr_t *firstaddr)
if (ndmpdp < 4) /* Minimum 4GB of dirmap */
ndmpdp = 4;
DMPDPphys = allocpages(firstaddr, NDMPML4E);
- if ((amd_feature & AMDID_PAGE1GB) == 0)
+ if (TRUE || (amd_feature & AMDID_PAGE1GB) == 0)
DMPDphys = allocpages(firstaddr, ndmpdp);
dmaplimit = (vm_paddr_t)ndmpdp << PDPSHIFT;
@@ -474,7 +474,7 @@ create_pagetables(vm_paddr_t *firstaddr)
/* Now set up the direct map space using either 2MB or 1GB pages */
/* Preset PG_M and PG_A because demotion expects it */
- if ((amd_feature & AMDID_PAGE1GB) == 0) {
+ if (TRUE || (amd_feature & AMDID_PAGE1GB) == 0) {
for (i = 0; i < NPDEPG * ndmpdp; i++) {
((pd_entry_t *)DMPDphys)[i] = (vm_paddr_t)i << PDRSHIFT;
((pd_entry_t *)DMPDphys)[i] |= PG_RW | PG_V | PG_PS |
More information about the svn-src-stable
mailing list