15 files changed, 15 insertions, 15 deletions
diff --git a/src/stat/chmod.c b/src/stat/chmod.c
index cb310fec..beb66e59 100644
--- a/src/stat/chmod.c
+++ b/src/stat/chmod.c
@@ -3,5 +3,5 @@
 
 int chmod(const char *path, mode_t mode)
 {
-	return syscall2(__NR_chmod, (long)path, mode);
+	return syscall(SYS_chmod, path, mode);
 }
diff --git a/src/stat/fchmod.c b/src/stat/fchmod.c
index 91897383..f9b99366 100644
--- a/src/stat/fchmod.c
+++ b/src/stat/fchmod.c
@@ -3,5 +3,5 @@
 
 int fchmod(int fd, mode_t mode)
 {
-	return syscall2(__NR_fchmod, fd, mode);
+	return syscall(SYS_fchmod, fd, mode);
 }
diff --git a/src/stat/fchmodat.c b/src/stat/fchmodat.c
index f4f22b2c..61d32065 100644
--- a/src/stat/fchmodat.c
+++ b/src/stat/fchmodat.c
@@ -3,5 +3,5 @@
 
 int fchmodat(int fd, const char *path, mode_t mode, int flag)
 {
-	return syscall4(__NR_fchmodat, fd, (long)path, mode, flag);
+	return syscall(SYS_fchmodat, fd, path, mode, flag);
 }
diff --git a/src/stat/fstat.c b/src/stat/fstat.c
index 88ac6f3c..10228f75 100644
--- a/src/stat/fstat.c
+++ b/src/stat/fstat.c
@@ -4,7 +4,7 @@
 
 int fstat(int fd, struct stat *buf)
 {
-	return syscall2(__NR_fstat, fd, (long)buf);
+	return syscall(SYS_fstat, fd, buf);
 }
 
 LFS64(fstat);
diff --git a/src/stat/fstatat.c b/src/stat/fstatat.c
index e39f833b..d6b9390c 100644
--- a/src/stat/fstatat.c
+++ b/src/stat/fstatat.c
@@ -4,7 +4,7 @@
 
 int fstatat(int fd, const char *path, struct stat *buf, int flag)
 {
-	return syscall4(__NR_fstatat, fd, (long)path, (long)buf, flag);
+	return syscall(SYS_fstatat, fd, path, buf, flag);
 }
 
 LFS64(fstatat);
diff --git a/src/stat/fstatvfs.c b/src/stat/fstatvfs.c
index 4a8bfe2e..8a2e4235 100644
--- a/src/stat/fstatvfs.c
+++ b/src/stat/fstatvfs.c
@@ -4,7 +4,7 @@
 
 int fstatvfs(int fd, struct statvfs *buf)
 {
-	return syscall2(__NR_fstatfs, fd, (long)buf);
+	return syscall(SYS_fstatfs, fd, buf);
 }
 
 weak_alias(fstatvfs, fstatfs);
diff --git a/src/stat/lstat.c b/src/stat/lstat.c
index 3b22e620..9053d998 100644
--- a/src/stat/lstat.c
+++ b/src/stat/lstat.c
@@ -4,7 +4,7 @@
 
 int lstat(const char *path, struct stat *buf)
 {
-	return syscall2(__NR_lstat, (long)path, (long)buf);
+	return syscall(SYS_lstat, path, buf);
 }
 
 LFS64(lstat);
diff --git a/src/stat/mkdir.c b/src/stat/mkdir.c
index 8295cad5..770e1ccc 100644
--- a/src/stat/mkdir.c
+++ b/src/stat/mkdir.c
@@ -3,5 +3,5 @@
 
 int mkdir(const char *path, mode_t mode)
 {
-	return syscall2(__NR_mkdir, (long)path, mode);
+	return syscall(SYS_mkdir, path, mode);
 }
diff --git a/src/stat/mkdirat.c b/src/stat/mkdirat.c
index 1fb38250..b8bc2527 100644
--- a/src/stat/mkdirat.c
+++ b/src/stat/mkdirat.c
@@ -3,5 +3,5 @@
 
 int mkdirat(int fd, const char *path, mode_t mode)
 {
-	return syscall3(__NR_mkdirat, fd, (long)path, mode);
+	return syscall(SYS_mkdirat, fd, path, mode);
 }
diff --git a/src/stat/mknod.c b/src/stat/mknod.c
index 0123eeef..90c6a1ca 100644
--- a/src/stat/mknod.c
+++ b/src/stat/mknod.c
@@ -6,5 +6,5 @@ int mknod(const char *path, mode_t mode, dev_t dev)
 	/* since dev_t is system-specific anyway we defer to the idiotic
 	 * legacy-compatible bitfield mapping of the type.. at least we've
 	 * made it large enough to leave space for future expansion.. */
-	return syscall3(__NR_mknod, (long)path, mode, dev & 0xffff);
+	return syscall(SYS_mknod, path, mode, dev & 0xffff);
 }
diff --git a/src/stat/mknodat.c b/src/stat/mknodat.c
index b5687e47..63cacd58 100644
--- a/src/stat/mknodat.c
+++ b/src/stat/mknodat.c
@@ -3,5 +3,5 @@
 
 int mknodat(int fd, const char *path, mode_t mode, dev_t dev)
 {
-	return syscall4(__NR_mknodat, fd, (long)path, mode, dev & 0xffff);
+	return syscall(SYS_mknodat, fd, path, mode, dev & 0xffff);
 }
diff --git a/src/stat/stat.c b/src/stat/stat.c
index 9847552a..c5491eb0 100644
--- a/src/stat/stat.c
+++ b/src/stat/stat.c
@@ -4,7 +4,7 @@
 
 int stat(const char *path, struct stat *buf)
 {
-	return syscall2(__NR_stat, (long)path, (long)buf);
+	return syscall(SYS_stat, path, buf);
 }
 
 LFS64(stat);
diff --git a/src/stat/statvfs.c b/src/stat/statvfs.c
index ebf14b43..17252997 100644
--- a/src/stat/statvfs.c
+++ b/src/stat/statvfs.c
@@ -4,7 +4,7 @@
 
 int statvfs(const char *path, struct statvfs *buf)
 {
-	return syscall2(__NR_statfs, (long)path, (long)buf);
+	return syscall(SYS_statfs, path, buf);
 }
 
 weak_alias(statvfs, statfs);
diff --git a/src/stat/umask.c b/src/stat/umask.c
index 49cb48a6..5ee913e2 100644
--- a/src/stat/umask.c
+++ b/src/stat/umask.c
@@ -3,5 +3,5 @@
 
 mode_t umask(mode_t mode)
 {
-	return syscall1(__NR_umask, mode);
+	return syscall(SYS_umask, mode);
 }
diff --git a/src/stat/utimensat.c b/src/stat/utimensat.c
index b9b02adf..929698bc 100644
--- a/src/stat/utimensat.c
+++ b/src/stat/utimensat.c
@@ -3,5 +3,5 @@
 
 int utimensat(int fd, const char *path, const struct timespec times[2], int flags)
 {
-	return syscall4(__NR_utimensat, fd, (long)path, (long)times, flags);
+	return syscall(SYS_utimensat, fd, path, times, flags);
 }