From 81dde4fdb2fb050b58ebc914343338b26b4d6cb2 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Sun, 23 Mar 2014 17:38:54 -0400
Subject: [PATCH] merge setresuid variants

---
 syscalls/setresuid.c   | 12 ++++++++++++
 syscalls/setresuid16.c | 12 ------------
 2 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 syscalls/setresuid16.c

diff --git a/syscalls/setresuid.c b/syscalls/setresuid.c
index 5e25c2c..68d8d34 100644
--- a/syscalls/setresuid.c
+++ b/syscalls/setresuid.c
@@ -10,3 +10,15 @@ struct syscallentry syscall_setresuid = {
 	.arg2name = "euid",
 	.arg3name = "suid",
 };
+
+/*
+ * SYSCALL_DEFINE3(setresuid16, old_uid_t, ruid, old_uid_t, euid, old_uid_t, suid)
+ */
+
+struct syscallentry syscall_setresuid16 = {
+	.name = "setresuid16",
+	.num_args = 3,
+	.arg1name = "ruid",
+	.arg2name = "euid",
+	.arg3name = "suid",
+};
diff --git a/syscalls/setresuid16.c b/syscalls/setresuid16.c
deleted file mode 100644
index d695531..0000000
--- a/syscalls/setresuid16.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * SYSCALL_DEFINE3(setresuid16, old_uid_t, ruid, old_uid_t, euid, old_uid_t, suid)
- */
-#include "sanitise.h"
-
-struct syscallentry syscall_setresuid16 = {
-	.name = "setresuid16",
-	.num_args = 3,
-	.arg1name = "ruid",
-	.arg2name = "euid",
-	.arg3name = "suid",
-};
-- 
2.11.4.GIT