shithub: riscv

Download patch

ref: ebfb4fdf2937bd9fc939ac85fdfc416e7fa7776d
parent: ad1eefb3556354b0fdf58faa3b4f5498d99a1f23
author: cinap_lenrek <[email protected]>
date: Sun Jan 19 22:17:55 EST 2014

kernel: convert putmmu() to uintptr for va and pa

--- a/sys/src/9/alphapc/mmu.c
+++ b/sys/src/9/alphapc/mmu.c
@@ -139,7 +139,7 @@
 }
 
 void
-putmmu(ulong va, ulong pa, Page *pg)
+putmmu(uintptr va, uintptr pa, Page *pg)
 {
 	int lvl2off;
 	uvlong *lvl2, *pt;
--- a/sys/src/9/bitsy/mmu.c
+++ b/sys/src/9/bitsy/mmu.c
@@ -362,7 +362,7 @@
  *  add an entry to the current map
  */
 void
-putmmu(ulong va, ulong pa, Page *pg)
+putmmu(uintptr va, uintptr pa, Page *pg)
 {
 	Page *l2pg;
 	ulong *t, *l1p, *l2p;
--- a/sys/src/9/mtx/mmu.c
+++ b/sys/src/9/mtx/mmu.c
@@ -176,7 +176,7 @@
 }
 
 void
-putmmu(ulong va, ulong pa, Page *pg)
+putmmu(uintptr va, uintptr pa, Page *pg)
 {
 	int mp;
 	char *ctl;
--- a/sys/src/9/omap4/mmu.c
+++ b/sys/src/9/omap4/mmu.c
@@ -139,7 +139,7 @@
 }
 
 void
-putmmu(ulong va, ulong pa, Page *)
+putmmu(uintptr va, uintptr pa, Page *)
 {
 	ulong *l1a, *l1b, *l2;
 	int l1o, l2o;
--- a/sys/src/9/pc/mmu.c
+++ b/sys/src/9/pc/mmu.c
@@ -421,7 +421,7 @@
  * Update the mmu in response to a user fault.  pa may have PTEWRITE set.
  */
 void
-putmmu(ulong va, ulong pa, Page*)
+putmmu(uintptr va, uintptr pa, Page*)
 {
 	int old, s;
 	Page *page;
--- a/sys/src/9/port/fault.c
+++ b/sys/src/9/port/fault.c
@@ -79,8 +79,7 @@
 	int type;
 	int ref;
 	Pte **p, *etp;
-	ulong mmuphys=0;
-	uintptr soff;
+	uintptr soff, mmuphys=0;
 	Page **pg, *lkp, *new;
 	Page *(*fn)(Segment*, uintptr);
 
--- a/sys/src/9/port/portfns.h
+++ b/sys/src/9/port/portfns.h
@@ -240,7 +240,7 @@
 Block*		pullupqueue(Queue*, int);
 void		putimage(Image*);
 void		putmhead(Mhead*);
-void		putmmu(ulong, ulong, Page*);
+void		putmmu(uintptr, uintptr, Page*);
 void		putpage(Page*);
 void		putseg(Segment*);
 void		putstrn(char*, int);
--- a/sys/src/9/ppc/mmu.c
+++ b/sys/src/9/ppc/mmu.c
@@ -196,7 +196,7 @@
 }
 
 void
-putmmu(ulong va, ulong pa, Page *pg)
+putmmu(uintptr va, uintptr pa, Page *pg)
 {
 	int mp;
 	char *ctl;