correct type of umbmalloc

Reference: /n/atom/patch/applied/umbmalloctype
Date: Sat Jan 11 22:05:07 CET 2014
Signed-off-by: quanstro@quanstro.net

--- /sys/src/9/pcpae/fns.h	Sat Jan 11 22:05:01 2014
+++ /sys/src/9/pcpae/fns.h	Sat Jan 11 22:05:01 2014
@@ -149,7 +149,7 @@
 void	trapinit0(void);
 int	tas(void*);
 uvlong	tscticks(uvlong*);
-uintmem	umbmalloc(uintmem, int, int);
+uintptr	umbmalloc(uintmem, int, int);
 void	umbfree(uintptr, int);
 uintmem	upaalloc(int, int);
 void	upafree(uintmem, int);
--- /sys/src/9/pcpae/memory.c	Sat Jan 11 22:05:01 2014
+++ /sys/src/9/pcpae/memory.c	Sat Jan 11 22:05:01 2014
@@ -625,14 +625,14 @@
 /*
  * Allocate memory from the upper memory blocks.
  */
-uintmem
+uintptr
 umbmalloc(uintmem pa, int size, int align)
 {
-	ulong a;
-
-	if(a = mapalloc(&rmapumb, pa, size, align))
-		return (ulong)KADDR(a);
+	uintmem a;
 
+	a = mapalloc(&rmapumb, pa, size, align);
+	if(a != 0)
+		return (uintptr)KADDR(a);
 	return 0;
 }