Date: Mon, 14 Mar 2011 05:13:52 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r219629 - projects/altix/sys/boot/ia64/common Message-ID: <201103140513.p2E5Dq3Q077883@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Mon Mar 14 05:13:52 2011 New Revision: 219629 URL: http://svn.freebsd.org/changeset/base/219629 Log: Change the sz argumnt to mmu_wire() from u_int to vm_size_t. It's a size in bytes... Modified: projects/altix/sys/boot/ia64/common/exec.c Modified: projects/altix/sys/boot/ia64/common/exec.c ============================================================================== --- projects/altix/sys/boot/ia64/common/exec.c Mon Mar 14 02:32:10 2011 (r219628) +++ projects/altix/sys/boot/ia64/common/exec.c Mon Mar 14 05:13:52 2011 (r219629) @@ -85,7 +85,7 @@ enter_kernel(uint64_t start, struct boot } static void -mmu_wire(vm_offset_t va, vm_paddr_t pa, u_int sz, u_int acc) +mmu_wire(vm_offset_t va, vm_paddr_t pa, vm_size_t sz, u_int acc) { static u_int iidx = 0, didx = 0; pt_entry_t pte; @@ -113,6 +113,7 @@ mmu_wire(vm_offset_t va, vm_paddr_t pa, __asm __volatile("mov cr.ifa=%0" :: "r"(va)); __asm __volatile("mov cr.itir=%0" :: "r"(shft << 2)); __asm __volatile("srlz.d;;"); + __asm __volatile("ptr.d %0,%1" :: "r"(va), "r"(shft << 2)); __asm __volatile("srlz.d;;"); __asm __volatile("itr.d dtr[%0]=%1" :: "r"(didx), "r"(pte)); @@ -148,7 +149,7 @@ mmu_setup_legacy(uint64_t entry) static void mmu_setup_paged(vm_offset_t pbvm_top) { - u_int sz; + vm_size_t sz; ia64_set_rr(IA64_RR_BASE(IA64_PBVM_RR), (IA64_PBVM_RR << 8) | (IA64_PBVM_PAGE_SHIFT << 2));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103140513.p2E5Dq3Q077883>