summaryrefslogtreecommitdiff
path: root/sys/src/9
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2014-01-20 03:17:55 +0100
committercinap_lenrek <cinap_lenrek@felloff.net>2014-01-20 03:17:55 +0100
commitebfb4fdf2937bd9fc939ac85fdfc416e7fa7776d (patch)
tree8c6360ab9638ce5df7f832cc1f260151bd509139 /sys/src/9
parentad1eefb3556354b0fdf58faa3b4f5498d99a1f23 (diff)
kernel: convert putmmu() to uintptr for va and pa
Diffstat (limited to 'sys/src/9')
-rw-r--r--sys/src/9/alphapc/mmu.c2
-rw-r--r--sys/src/9/bitsy/mmu.c2
-rw-r--r--sys/src/9/mtx/mmu.c2
-rw-r--r--sys/src/9/omap4/mmu.c2
-rw-r--r--sys/src/9/pc/mmu.c2
-rw-r--r--sys/src/9/port/fault.c3
-rw-r--r--sys/src/9/port/portfns.h2
-rw-r--r--sys/src/9/ppc/mmu.c2
8 files changed, 8 insertions, 9 deletions
diff --git a/sys/src/9/alphapc/mmu.c b/sys/src/9/alphapc/mmu.c
index c15d176d7..0e1e0bb64 100644
--- a/sys/src/9/alphapc/mmu.c
+++ b/sys/src/9/alphapc/mmu.c
@@ -139,7 +139,7 @@ mmunewtop(void)
}
void
-putmmu(ulong va, ulong pa, Page *pg)
+putmmu(uintptr va, uintptr pa, Page *pg)
{
int lvl2off;
uvlong *lvl2, *pt;
diff --git a/sys/src/9/bitsy/mmu.c b/sys/src/9/bitsy/mmu.c
index 8e1a46315..d3812941b 100644
--- a/sys/src/9/bitsy/mmu.c
+++ b/sys/src/9/bitsy/mmu.c
@@ -362,7 +362,7 @@ static ulong mmubits[16] =
* 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;
diff --git a/sys/src/9/mtx/mmu.c b/sys/src/9/mtx/mmu.c
index 6332272ca..255cf5f5a 100644
--- a/sys/src/9/mtx/mmu.c
+++ b/sys/src/9/mtx/mmu.c
@@ -176,7 +176,7 @@ mmurelease(Proc* p)
}
void
-putmmu(ulong va, ulong pa, Page *pg)
+putmmu(uintptr va, uintptr pa, Page *pg)
{
int mp;
char *ctl;
diff --git a/sys/src/9/omap4/mmu.c b/sys/src/9/omap4/mmu.c
index f91c0342a..e5352b5fc 100644
--- a/sys/src/9/omap4/mmu.c
+++ b/sys/src/9/omap4/mmu.c
@@ -139,7 +139,7 @@ mmuswitch(Proc *p)
}
void
-putmmu(ulong va, ulong pa, Page *)
+putmmu(uintptr va, uintptr pa, Page *)
{
ulong *l1a, *l1b, *l2;
int l1o, l2o;
diff --git a/sys/src/9/pc/mmu.c b/sys/src/9/pc/mmu.c
index ca5046133..b91edf90e 100644
--- a/sys/src/9/pc/mmu.c
+++ b/sys/src/9/pc/mmu.c
@@ -421,7 +421,7 @@ upallocpdb(void)
* 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;
diff --git a/sys/src/9/port/fault.c b/sys/src/9/port/fault.c
index 828175202..55a739bc3 100644
--- a/sys/src/9/port/fault.c
+++ b/sys/src/9/port/fault.c
@@ -79,8 +79,7 @@ fixfault(Segment *s, uintptr addr, int read, int doputmmu)
int type;
int ref;
Pte **p, *etp;
- ulong mmuphys=0;
- uintptr soff;
+ uintptr soff, mmuphys=0;
Page **pg, *lkp, *new;
Page *(*fn)(Segment*, uintptr);
diff --git a/sys/src/9/port/portfns.h b/sys/src/9/port/portfns.h
index 3cfad6b54..e5d809b17 100644
--- a/sys/src/9/port/portfns.h
+++ b/sys/src/9/port/portfns.h
@@ -240,7 +240,7 @@ Block* pullupblock(Block*, int);
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);
diff --git a/sys/src/9/ppc/mmu.c b/sys/src/9/ppc/mmu.c
index 589f251c8..94dbeb03c 100644
--- a/sys/src/9/ppc/mmu.c
+++ b/sys/src/9/ppc/mmu.c
@@ -196,7 +196,7 @@ mmurelease(Proc* p)
}
void
-putmmu(ulong va, ulong pa, Page *pg)
+putmmu(uintptr va, uintptr pa, Page *pg)
{
int mp;
char *ctl;