Date: Wed, 25 Nov 2009 02:39:33 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r199780 - user/kmacy/releng_8_fcs_buf_xen/sys/amd64/amd64 Message-ID: <200911250239.nAP2dXHQ036866@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Wed Nov 25 02:39:33 2009 New Revision: 199780 URL: http://svn.freebsd.org/changeset/base/199780 Log: fix mismerge Modified: user/kmacy/releng_8_fcs_buf_xen/sys/amd64/amd64/pmap.c Modified: user/kmacy/releng_8_fcs_buf_xen/sys/amd64/amd64/pmap.c ============================================================================== --- user/kmacy/releng_8_fcs_buf_xen/sys/amd64/amd64/pmap.c Wed Nov 25 02:39:11 2009 (r199779) +++ user/kmacy/releng_8_fcs_buf_xen/sys/amd64/amd64/pmap.c Wed Nov 25 02:39:33 2009 (r199780) @@ -1153,8 +1153,7 @@ pmap_qenter_prot(vm_offset_t sva, vm_pag while (pte < endpte) { oldpte |= *pte; pte_store(pte, VM_PAGE_TO_PHYS(*ma) | PG_G | - pmap_cache_bits((*ma)->md.pat_mode, 0) | PG_RW | PG_V); - pte_store(pte, VM_PAGE_TO_PHYS(*ma) | PG_G | flags); + pmap_cache_bits((*ma)->md.pat_mode, 0) | flags | PG_V); if (prot & VM_PROT_EXCLUDE) dump_exclude_page(VM_PAGE_TO_PHYS(*ma)); pte++; @@ -1174,7 +1173,6 @@ pmap_qenter(vm_offset_t sva, vm_page_t * } - /* * This routine tears out page mappings from the * kernel -- it is meant only for temporary mappings.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911250239.nAP2dXHQ036866>