svn commit: r255620 - head/sys/i386/i386

[Konstantin Belousov]

Author: kib
Date: Mon Sep 16 19:58:37 2013
New Revision: 255620
URL: http://svnweb.freebsd.org/changeset/base/255620

Log:
  Merge the change r255607 from amd64 to i386.
  
  Reviewed by:	alc
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week
  Approved by:	re (gjb)

Modified:
  head/sys/i386/i386/pmap.c

Modified: head/sys/i386/i386/pmap.c
==============================================================================
--- head/sys/i386/i386/pmap.c	Mon Sep 16 19:29:18 2013	(r255619)
+++ head/sys/i386/i386/pmap.c	Mon Sep 16 19:58:37 2013	(r255620)
@@ -4062,6 +4062,8 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm
 			continue;
 			
 		if (srcptepaddr & PG_PS) {
+			if ((addr & PDRMASK) != 0 || addr + NBPDR > end_addr)
+				continue;
 			if (dst_pmap->pm_pdir[ptepindex] == 0 &&
 			    ((srcptepaddr & PG_MANAGED) == 0 ||
 			    pmap_pv_insert_pde(dst_pmap, addr, srcptepaddr &