Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Feb 2019 04:47:34 +0000 (UTC)
From:      Justin Hibbits <jhibbits@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r344204 - head/sys/powerpc/booke
Message-ID:  <201902160447.x1G4lYrh003782@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhibbits
Date: Sat Feb 16 04:47:33 2019
New Revision: 344204
URL: https://svnweb.freebsd.org/changeset/base/344204

Log:
  powerpc/booke: Fix 32-bit build
  
  MFC after:	2 weeks
  MFC with:	344202

Modified:
  head/sys/powerpc/booke/pmap.c

Modified: head/sys/powerpc/booke/pmap.c
==============================================================================
--- head/sys/powerpc/booke/pmap.c	Sat Feb 16 04:38:34 2019	(r344203)
+++ head/sys/powerpc/booke/pmap.c	Sat Feb 16 04:47:33 2019	(r344204)
@@ -3053,8 +3053,11 @@ mmu_booke_copy_pages(mmu_t mmu, vm_page_t *ma, vm_offs
 	int cnt;
 
 	if (hw_direct_map) {
-		bcopy((caddr_t)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(*ma)) + a_offset,
-		    (caddr_t)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(*mb)), xfersize);
+		a_cp = (caddr_t)((uintptr_t)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(*ma)) +
+		    a_offset);
+		b_cp = (caddr_t)((uintptr_t)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(*mb)) +
+		    b_offset);
+		bcopy(a_cp, b_cp, xfersize);
 	} else {
 		mtx_lock(&copy_page_mutex);
 		while (xfersize > 0) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902160447.x1G4lYrh003782>