From 06646d663aa466351be91f76405db717733dfea6 Mon Sep 17 00:00:00 2001
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 16 Sep 2013 19:58:37 +0000
Subject: [PATCH] Merge the change r255607 from amd64 to i386.

Reviewed by:	alc
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Approved by:	re (gjb)
---
 sys/i386/i386/pmap.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index a3b93a74867a..c9f327c3fd1c 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -4062,6 +4062,8 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_t dst_addr, vm_size_t len,
 			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 &