Date: Fri, 13 Apr 2012 15:43:42 +0000 (UTC) From: "Cherry G. Mathew" <cherry@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r234226 - projects/amd64_xen_pv/sys/amd64/xen Message-ID: <201204131543.q3DFhg0b086466@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cherry Date: Fri Apr 13 15:43:42 2012 New Revision: 234226 URL: http://svn.freebsd.org/changeset/base/234226 Log: pmap_xen_bootpages() doesn't require the vm system to be initialised since we "steal" and waste the pages from early boot physfree. Remove incorrect asserts and related comment. Approved by: gibbs (implicit) Modified: projects/amd64_xen_pv/sys/amd64/xen/pmap.c Modified: projects/amd64_xen_pv/sys/amd64/xen/pmap.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/pmap.c Fri Apr 13 15:33:12 2012 (r234225) +++ projects/amd64_xen_pv/sys/amd64/xen/pmap.c Fri Apr 13 15:43:42 2012 (r234226) @@ -282,8 +282,6 @@ create_boot_pagetables(vm_paddr_t *first } /* - * Note: pmap_xen_bootpages assumes and asserts for the fact that the - * kernel virtual start and end values have been initialised. * * Map in the xen provided shared pages. They are: * - shared info page @@ -297,11 +295,6 @@ pmap_xen_bootpages(vm_paddr_t *firstaddr vm_offset_t va; vm_paddr_t ma; - KASSERT(virtual_avail != 0, - ("kernel virtual address space un-initialised!")); - KASSERT(virtual_avail >= (KERNBASE + physmem), - ("kernel virtual address space inconsistent!")); - /* Share info */ ma = xen_start_info->shared_info; @@ -342,6 +335,9 @@ pmap_bootstrap(vm_paddr_t *firstaddr) pmap_xen_setpages_rw(xen_start_info->pt_base, xen_start_info->nr_pt_frames); + /* Map in Xen related pages into VA space */ + pmap_xen_bootpages(firstaddr); + /* * gc newly free pages (bootstrap PTs and bootstrap stack, * mostly, I think.). @@ -350,9 +346,6 @@ pmap_bootstrap(vm_paddr_t *firstaddr) virtual_end = VM_MAX_KERNEL_ADDRESS; /* XXX: Check we don't overlap xen pgdir entries. */ - /* Map in Xen related pages into VA space */ - pmap_xen_bootpages(firstaddr); - } void
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204131543.q3DFhg0b086466>