Date: Tue, 27 Nov 2012 21:27:12 +0000 (UTC) From: "Cherry G. Mathew" <cherry@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r243632 - in projects/amd64_xen_pv/sys: amd64/amd64 amd64/include conf Message-ID: <201211272127.qARLRCAD062353@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cherry Date: Tue Nov 27 21:27:12 2012 New Revision: 243632 URL: http://svnweb.freebsd.org/changeset/base/243632 Log: Stop using the MD specific uma backend allocator on Xen. Approved by: gibbs(implicit) Modified: projects/amd64_xen_pv/sys/amd64/amd64/uma_machdep.c projects/amd64_xen_pv/sys/amd64/include/vmparam.h projects/amd64_xen_pv/sys/conf/files.amd64 Modified: projects/amd64_xen_pv/sys/amd64/amd64/uma_machdep.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/amd64/uma_machdep.c Tue Nov 27 21:19:58 2012 (r243631) +++ projects/amd64_xen_pv/sys/amd64/amd64/uma_machdep.c Tue Nov 27 21:27:12 2012 (r243632) @@ -68,12 +68,6 @@ uma_small_alloc(uma_zone_t zone, int byt if ((wait & M_NODUMP) == 0) dump_add_page(pa); va = (void *)PHYS_TO_DMAP(pa); -#ifdef XEN - /* XXX: temp fix, dmap not yet implemented. */ - vm_offset_t vaddr = (vm_offset_t) va; - pmap_map(&vaddr, pa, pa + roundup(bytes, PAGE_SIZE), - VM_PROT_READ | VM_PROT_WRITE); -#endif if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) pagezero(va); return (va); Modified: projects/amd64_xen_pv/sys/amd64/include/vmparam.h ============================================================================== --- projects/amd64_xen_pv/sys/amd64/include/vmparam.h Tue Nov 27 21:19:58 2012 (r243631) +++ projects/amd64_xen_pv/sys/amd64/include/vmparam.h Tue Nov 27 21:27:12 2012 (r243632) @@ -73,8 +73,12 @@ * We provide a machine specific single page allocator through the use * of the direct mapped segment. This uses 2MB pages for reduced * TLB pressure. + * Note: XEN does not use this as kmem_alloc() is functional via its + * own boot time mapped backend allocator. */ +#ifndef XEN #define UMA_MD_SMALL_ALLOC +#endif /* * The physical address space is densely populated. Modified: projects/amd64_xen_pv/sys/conf/files.amd64 ============================================================================== --- projects/amd64_xen_pv/sys/conf/files.amd64 Tue Nov 27 21:19:58 2012 (r243631) +++ projects/amd64_xen_pv/sys/conf/files.amd64 Tue Nov 27 21:27:12 2012 (r243632) @@ -135,7 +135,7 @@ amd64/amd64/support.S standard amd64/amd64/sys_machdep.c standard amd64/amd64/trap.c standard amd64/amd64/uio_machdep.c standard -amd64/amd64/uma_machdep.c standard +amd64/amd64/uma_machdep.c optional native amd64/amd64/vm_machdep.c standard amd64/pci/pci_cfgreg.c optional pci amd64/xen/clock.c optional xen
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211272127.qARLRCAD062353>