From 838ba9eba89f5c7a76cb9667900f5c82ad6f7659 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Tue, 15 Apr 2014 16:50:36 -0400
Subject: [PATCH] merge listxattr variants

---
 syscalls/listxattr.c  | 16 ++++++++++++++++
 syscalls/llistxattr.c | 16 ----------------
 2 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 syscalls/llistxattr.c

diff --git a/syscalls/listxattr.c b/syscalls/listxattr.c
index de9583e..0ffadc2 100644
--- a/syscalls/listxattr.c
+++ b/syscalls/listxattr.c
@@ -14,3 +14,19 @@ struct syscallentry syscall_listxattr = {
 	.arg3type = ARG_LEN,
 	.group = GROUP_VFS,
 };
+
+
+/*
+ * SYSCALL_DEFINE3(llistxattr, const char __user *, pathname, char __user *, list, size_t, size)
+ */
+struct syscallentry syscall_llistxattr = {
+	.name = "llistxattr",
+	.arg1name = "pathname",
+	.arg1type = ARG_PATHNAME,
+	.arg2name = "list",
+	.arg2type = ARG_ADDRESS,
+	.arg3name = "size",
+	.arg3type = ARG_LEN,
+	.num_args = 3,
+	.group = GROUP_VFS,
+};
diff --git a/syscalls/llistxattr.c b/syscalls/llistxattr.c
deleted file mode 100644
index 10217f7..0000000
--- a/syscalls/llistxattr.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SYSCALL_DEFINE3(llistxattr, const char __user *, pathname, char __user *, list, size_t, size)
- */
-#include "sanitise.h"
-
-struct syscallentry syscall_llistxattr = {
-	.name = "llistxattr",
-	.arg1name = "pathname",
-	.arg1type = ARG_PATHNAME,
-	.arg2name = "list",
-	.arg2type = ARG_ADDRESS,
-	.arg3name = "size",
-	.arg3type = ARG_LEN,
-	.num_args = 3,
-	.group = GROUP_VFS,
-};
-- 
2.11.4.GIT