Make kernel and user syscall signatures match for remaining syscalls

e3a2f2ae · Austin Clements · 56e43c9b · e3a2f2ae · e3a2f2ae · e3a2f2ae
--- a/include/kern_c.h
+++ b/include/kern_c.h
@@ -49,10 +49,10 @@ int sys_bind(int xsock, const struct sockaddr *xaddr, int xaddrlen);
 int sys_listen(int, int);
 int sys_accept(int, struct sockaddr*, int*);
 ssize_t sys_pread(int fd, void *ubuf, size_t count, off_t offset);
-long sys_async(int, size_t, off_t, u32, u32);
-long sys_script(void *addr, u64 len, u64 chunk);
+int sys_async(int, size_t, off_t, int, int);
+int sys_script(void *addr, u64 len, u64 chunk);
 int sys_setfs(u64 base);
-long sys_wqwait(void);
+int sys_wqwait(void);
 int sys_setaffinity(int cpu);
 long sys_futex(const u64* addr, int op, u64 val, u64 timer);
 extern long (*syscalls[])(u64, u64, u64, u64, u64);

--- a/include/user.h
+++ b/include/user.h
@@ -31,7 +31,7 @@ int map(void *addr, size_t len);
 int unmap(void *addr, size_t len);
 int halt(void);
 ssize_t pread(int, void*, size_t, off_t);
-int async(int, size_t, off_t, u32, u32);
+int async(int, size_t, off_t, int, int);
 int script(void *addr, u64 len, u64 chunk);
 int setfs(u64 base);
 int setaffinity(int cpu);

--- a/kernel/async.cc
+++ b/kernel/async.cc
@@ -52,9 +52,9 @@ pread_allocwork(struct inode *ip, size_t count, off_t off,
  return w;
 }

-long
+int
 sys_async(int fd, size_t count, off_t off,
-          msgid_t msgid, pageid_t pageid)
+          int msgid, int pageid)
 {
  sref<file> f;;
  cwork *w;

--- a/kernel/script.cc
+++ b/kernel/script.cc
@@ -28,7 +28,7 @@ script_mmap_work(void *a0, void *a1, void *a2, void *a3)
  *donep += 1;
 }

-long
+int
 sys_script(void *addr, u64 len, u64 chunk)
 {
  atomic<int> done;

--- a/kernel/uwq.cc
+++ b/kernel/uwq.cc
@@ -52,7 +52,7 @@ uwq_trywork(void)
  return false;
 }

-long
+int
 sys_wqwait(void)
 {
  uwq_worker* w = myproc()->worker;