X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Farch%2Fx86_64%2Fmm_virt.c;h=83e1d1fb3eefd06a93a3e6e0e17fb84aabc6b167;hb=819ea8133d95cd688c47b4f688c2503db9a9bccd;hp=de7ae5212fe61b536a7090ae32f8c8eca88e9f97;hpb=f6417c24aede5213c856a78fc21bc3ac7e1becab;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/arch/x86_64/mm_virt.c b/KernelLand/Kernel/arch/x86_64/mm_virt.c
index de7ae521..83e1d1fb 100644
--- a/KernelLand/Kernel/arch/x86_64/mm_virt.c
+++ b/KernelLand/Kernel/arch/x86_64/mm_virt.c
@@ -609,7 +609,7 @@ int MM_GetPageEntry(tVAddr Addr, tPAddr *Phys, Uint *Flags)
 /**
  * \brief Get the physical address of a virtual location
  */
-tPAddr MM_GetPhysAddr(const void *Ptr)
+tPAddr MM_GetPhysAddr(volatile const void *Ptr)
 {
 	tVAddr	Addr = (tVAddr)Ptr;
 	tPAddr	*ptr;
@@ -797,7 +797,7 @@ int MM_IsValidBuffer(tVAddr Addr, size_t Size)
 /**
  * \brief Map a range of hardware pages
  */
-tVAddr MM_MapHWPages(tPAddr PAddr, Uint Number)
+void *MM_MapHWPages(tPAddr PAddr, Uint Number)
 {
 	tVAddr	ret;
 	 int	num;
@@ -824,7 +824,7 @@ tVAddr MM_MapHWPages(tPAddr PAddr, Uint Number)
 			MM_RefPhys(PAddr);
 		}
 		
-		return ret;
+		return (void*)ret;
 	}
 	
 	Log_Error("MM", "MM_MapHWPages - No space for %i pages", Number);
@@ -854,10 +854,10 @@ void MM_UnmapHWPages(tVAddr VAddr, Uint Number)
  * \param PhysAddr	Pointer to the location to place the physical address allocated
  * \return Virtual address allocate
  */
-tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
+void *MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
 {
 	tPAddr	phys;
-	tVAddr	ret;
+	void	*ret;
 	
 	// Sanity Check
 	if(MaxBits < 12 || !PhysAddr)	return 0;