summaryrefslogtreecommitdiff
path: root/libre/linux-libre-api-headers/linux-3.14-xattr_header.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/linux-libre-api-headers/linux-3.14-xattr_header.patch')
-rw-r--r--libre/linux-libre-api-headers/linux-3.14-xattr_header.patch76
1 files changed, 0 insertions, 76 deletions
diff --git a/libre/linux-libre-api-headers/linux-3.14-xattr_header.patch b/libre/linux-libre-api-headers/linux-3.14-xattr_header.patch
deleted file mode 100644
index 1ea583d86..000000000
--- a/libre/linux-libre-api-headers/linux-3.14-xattr_header.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From ea1a8217b06b41b31a2b60b0b83f75c77ef9c873 Mon Sep 17 00:00:00 2001
-From: Serge Hallyn <serge.hallyn@ubuntu.com>
-Date: Thu, 3 Apr 2014 14:48:33 -0700
-Subject: xattr: guard against simultaneous glibc header inclusion
-
-If the glibc xattr.h header is included after the uapi header,
-compilation fails due to an enum re-using a #define from the uapi
-header.
-
-Protect against this by guarding the define and enum inclusions against
-each other.
-
-(See https://lists.debian.org/debian-glibc/2014/03/msg00029.html
-and https://sourceware.org/glibc/wiki/Synchronizing_Headers
-for more information.)
-
-Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
-Cc: Andrew Morton <akpm@linux-foundation.org>
-Cc: Allan McRae <allan@archlinux.org>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-
-diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h
-index 335e8a7..c140620 100644
---- a/include/uapi/linux/libc-compat.h
-+++ b/include/uapi/linux/libc-compat.h
-@@ -85,6 +85,12 @@
-
- #endif /* _NETINET_IN_H */
-
-+/* Definitions for xattr.h */
-+#if defined(_SYS_XATTR_H)
-+#define __UAPI_DEF_XATTR 0
-+#else
-+#define __UAPI_DEF_XATTR 1
-+#endif
-
- /* If we did not see any headers from any supported C libraries,
- * or we are being included in the kernel, then define everything
-@@ -98,6 +104,9 @@
- #define __UAPI_DEF_IPV6_MREQ 1
- #define __UAPI_DEF_IPPROTO_V6 1
-
-+/* Definitions for xattr.h */
-+#define __UAPI_DEF_XATTR 1
-+
- #endif /* __GLIBC__ */
-
- #endif /* _UAPI_LIBC_COMPAT_H */
-diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
-index 40bbc04..c38355c 100644
---- a/include/uapi/linux/xattr.h
-+++ b/include/uapi/linux/xattr.h
-@@ -7,11 +7,18 @@
- Copyright (c) 2001-2002 Silicon Graphics, Inc. All Rights Reserved.
- Copyright (c) 2004 Red Hat, Inc., James Morris <jmorris@redhat.com>
- */
-+
-+#include <linux/libc-compat.h>
-+
- #ifndef _UAPI_LINUX_XATTR_H
- #define _UAPI_LINUX_XATTR_H
-
-+#ifdef __UAPI_DEF_XATTR
-+#define __USE_KERNEL_XATTR_DEFS
-+
- #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */
- #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */
-+#endif
-
- /* Namespaces */
- #define XATTR_OS2_PREFIX "os2."
---
-cgit v0.10.1
-