diff options
author | 2016-11-14 20:04:44 +0000 | |
---|---|---|
committer | 2016-11-14 20:04:44 +0000 | |
commit | 3dd0867b44edb81ced68cfe5776cca836c2d5311 (patch) | |
tree | 73f8223a316b635314a565fbbe8557c077c9f04f | |
parent | add more packages for testing (diff) | |
download | linux-headers-patches-3dd0867b44edb81ced68cfe5776cca836c2d5311.tar.gz linux-headers-patches-3dd0867b44edb81ced68cfe5776cca836c2d5311.tar.bz2 linux-headers-patches-3dd0867b44edb81ced68cfe5776cca836c2d5311.zip |
initial 4.8 patchset based on last 4.7 patchset
11 files changed, 522 insertions, 0 deletions
diff --git a/4.8/00_all_0001-linux-stat.h-remove-__GLIBC__-checks.patch b/4.8/00_all_0001-linux-stat.h-remove-__GLIBC__-checks.patch new file mode 100644 index 0000000..5a7700a --- /dev/null +++ b/4.8/00_all_0001-linux-stat.h-remove-__GLIBC__-checks.patch @@ -0,0 +1,28 @@ +From e55c8269d02e2bd0d25eb3ec49fb5713904f9b98 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 29 Dec 2008 06:52:59 -0500 +Subject: [PATCH] linux/stat.h: remove __GLIBC__ checks + +Only check __KERNEL__ so we don't assume the C library is glibc. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + include/uapi/linux/stat.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/uapi/linux/stat.h b/include/uapi/linux/stat.h +index 7fec7e36d921..256ad24c64a8 100644 +--- a/include/uapi/linux/stat.h ++++ b/include/uapi/linux/stat.h +@@ -2,7 +2,7 @@ + #define _UAPI_LINUX_STAT_H + + +-#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) ++#if defined(__KERNEL__) + + #define S_IFMT 00170000 + #define S_IFSOCK 0140000 +-- +2.9.0 + diff --git a/4.8/00_all_0002-netfilter-pull-in-limits.h.patch b/4.8/00_all_0002-netfilter-pull-in-limits.h.patch new file mode 100644 index 0000000..27b9a6e --- /dev/null +++ b/4.8/00_all_0002-netfilter-pull-in-limits.h.patch @@ -0,0 +1,28 @@ +From b6e6da99354af0d1a25ea7ee40cf706f9e947f50 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 9 May 2009 17:30:35 -0400 +Subject: [PATCH] netfilter: pull in limits.h + +A few netfilter sub-headers use INT_MAX which is in limits.h. + +URL: http://bugs.gentoo.org/246160 +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + include/uapi/linux/netfilter.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/uapi/linux/netfilter.h b/include/uapi/linux/netfilter.h +index d93f949d1d9a..beed62c8ce92 100644 +--- a/include/uapi/linux/netfilter.h ++++ b/include/uapi/linux/netfilter.h +@@ -6,6 +6,7 @@ + #include <linux/sysctl.h> + #include <linux/in.h> + #include <linux/in6.h> ++#include <limits.h> + + /* Responses from hook functions. */ + #define NF_DROP 0 +-- +2.9.0 + diff --git a/4.8/00_all_0003-convert-PAGE_SIZE-usage.patch b/4.8/00_all_0003-convert-PAGE_SIZE-usage.patch new file mode 100644 index 0000000..6bad7e8 --- /dev/null +++ b/4.8/00_all_0003-convert-PAGE_SIZE-usage.patch @@ -0,0 +1,54 @@ +From 94227b4b9484d38a89bce9fe7eb2521ee88012a5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 13 Feb 2010 03:09:23 -0500 +Subject: [PATCH] convert PAGE_SIZE usage + +The size of a page may change at runtime or based on kernel settings, so +a static value at compile time doesn't work. More importantly, no one +exports PAGE_SIZE to user space anymore. + +URL: http://bugs.gentoo.org/301431 +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + include/uapi/linux/binfmts.h | 3 ++- + include/uapi/linux/resource.h | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/include/uapi/linux/binfmts.h b/include/uapi/linux/binfmts.h +index 4eb5972867c0..516bfcf62f64 100644 +--- a/include/uapi/linux/binfmts.h ++++ b/include/uapi/linux/binfmts.h +@@ -1,6 +1,7 @@ + #ifndef _UAPI_LINUX_BINFMTS_H + #define _UAPI_LINUX_BINFMTS_H + ++#include <unistd.h> + #include <linux/capability.h> + + struct pt_regs; +@@ -11,7 +12,7 @@ struct pt_regs; + * prevent the kernel from being unduly impacted by misaddressed pointers. + * MAX_ARG_STRINGS is chosen to fit in a signed 32-bit integer. + */ +-#define MAX_ARG_STRLEN (PAGE_SIZE * 32) ++#define MAX_ARG_STRLEN (sysconf(_SC_PAGESIZE) * 32) + #define MAX_ARG_STRINGS 0x7FFFFFFF + + /* sizeof(linux_binprm->buf) */ +diff --git a/include/uapi/linux/resource.h b/include/uapi/linux/resource.h +index 36fb3b5fb181..58efd0799cd7 100644 +--- a/include/uapi/linux/resource.h ++++ b/include/uapi/linux/resource.h +@@ -68,7 +68,8 @@ struct rlimit64 { + * GPG2 wants 64kB of mlocked memory, to make sure pass phrases + * and other sensitive information are never written to disk. + */ +-#define MLOCK_LIMIT ((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024) ++/* No one currently defines PAGE_SIZE bigger than 64kB */ ++#define MLOCK_LIMIT (64 * 1024) + + /* + * Due to binary compatibility, the actual resource numbers +-- +2.9.0 + diff --git a/4.8/00_all_0004-asm-generic-fcntl.h-namespace-kernel-file-structs.patch b/4.8/00_all_0004-asm-generic-fcntl.h-namespace-kernel-file-structs.patch new file mode 100644 index 0000000..74f1668 --- /dev/null +++ b/4.8/00_all_0004-asm-generic-fcntl.h-namespace-kernel-file-structs.patch @@ -0,0 +1,54 @@ +From 90ce24bfa6c3eafbac289ffeb57e5f95d60c6883 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 29 Dec 2008 07:39:14 -0500 +Subject: [PATCH] asm-generic/fcntl.h: namespace kernel file structs + +No one should be using these structs, but just in case they are, +keep them available in the __kernel_ namespace. + +Otherwise, trying to include something like: + #include <fcntl.h> + #include <linux/inotify.h> +leads to horrible failure. + +URL: http://bugs.gentoo.org/244470 +URL: http://bugs.gentoo.org/388633 +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + include/uapi/asm-generic/fcntl.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h +index e063effe0cc1..a98769e712ce 100644 +--- a/include/uapi/asm-generic/fcntl.h ++++ b/include/uapi/asm-generic/fcntl.h +@@ -152,7 +152,7 @@ + #define F_OWNER_PID 1 + #define F_OWNER_PGRP 2 + +-struct f_owner_ex { ++struct __kernel_f_owner_ex { + int type; + __kernel_pid_t pid; + }; +@@ -192,7 +192,7 @@ struct f_owner_ex { + #define __ARCH_FLOCK_PAD + #endif + +-struct flock { ++struct __kernel_flock { + short l_type; + short l_whence; + __kernel_off_t l_start; +@@ -207,7 +207,7 @@ struct flock { + #define __ARCH_FLOCK64_PAD + #endif + +-struct flock64 { ++struct __kernel_flock64 { + short l_type; + short l_whence; + __kernel_loff_t l_start; +-- +2.9.0 + diff --git a/4.8/00_all_0005-unifdef-drop-unused-errno.h-include.patch b/4.8/00_all_0005-unifdef-drop-unused-errno.h-include.patch new file mode 100644 index 0000000..0241c61 --- /dev/null +++ b/4.8/00_all_0005-unifdef-drop-unused-errno.h-include.patch @@ -0,0 +1,32 @@ +From 4d930b5e01d05dbc2e0f9a60288f924228303120 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Tue, 6 Dec 2011 17:22:42 -0500 +Subject: [PATCH] unifdef: drop unused errno.h include + +This is the only header on my system that ends up requiring kernel +headers, so if the kernel headers aren't available, we end up being +unable to install kernel headers :). + +Since this file doesn't actually use anything from errno.h, drop +the include so it at least makes us a bit more robust on glibc. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + scripts/unifdef.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/scripts/unifdef.c b/scripts/unifdef.c +index 7493c0ee51cc..c5dfae538b08 100644 +--- a/scripts/unifdef.c ++++ b/scripts/unifdef.c +@@ -48,7 +48,6 @@ + + #include <ctype.h> + #include <err.h> +-#include <errno.h> + #include <stdarg.h> + #include <stdbool.h> + #include <stdio.h> +-- +2.9.0 + diff --git a/4.8/00_all_0006-x86-do-not-build-relocs-tool-when-installing-headers.patch b/4.8/00_all_0006-x86-do-not-build-relocs-tool-when-installing-headers.patch new file mode 100644 index 0000000..e394d56 --- /dev/null +++ b/4.8/00_all_0006-x86-do-not-build-relocs-tool-when-installing-headers.patch @@ -0,0 +1,33 @@ +From 37c6964a11fe7f1934c4ac8bfd606158f0dfee6b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 15 Nov 2014 03:37:38 -0500 +Subject: [PATCH] x86: do not build relocs tool when installing headers + +This isn't needed to install headers, so don't bother building it. +Otherwise we run into a chicken/egg issue where we need the kernel +headers in order to install the kernel headers. It's also a waste +of time. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + arch/x86/Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/x86/Makefile b/arch/x86/Makefile +index 830ed391e7ef..2efbb7ba2004 100644 +--- a/arch/x86/Makefile ++++ b/arch/x86/Makefile +@@ -181,8 +181,10 @@ KBUILD_CFLAGS += -fno-asynchronous-unwind-tables + KBUILD_CFLAGS += $(mflags-y) + KBUILD_AFLAGS += $(mflags-y) + ++ifneq ($(filter-out headers_install,$(MAKECMDGOALS)),) + archscripts: scripts_basic + $(Q)$(MAKE) $(build)=arch/x86/tools relocs ++endif + + ### + # Syscall table generation +-- +2.9.0 + diff --git a/4.8/00_all_0007-timerfd-export-defines-to-userspace.patch b/4.8/00_all_0007-timerfd-export-defines-to-userspace.patch new file mode 100644 index 0000000..1b78604 --- /dev/null +++ b/4.8/00_all_0007-timerfd-export-defines-to-userspace.patch @@ -0,0 +1,74 @@ +From 5555c3168906490caa876107f27647a2a14037e5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Tue, 30 Dec 2014 19:14:51 -0500 +Subject: [PATCH] timerfd: export defines to userspace + +Since userspace is expected to call timerfd syscalls directly with these +flags/ioctls, make sure we export them so they don't have to duplicate +the values themselves. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + include/linux/timerfd.h | 20 +------------------- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/timerfd.h | 36 ++++++++++++++++++++++++++++++++++++ + 3 files changed, 38 insertions(+), 19 deletions(-) + create mode 100644 include/uapi/linux/timerfd.h + +diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild +index 185f8ea2702f..5f6098f3e25c 100644 +--- a/include/uapi/linux/Kbuild ++++ b/include/uapi/linux/Kbuild +@@ -406,6 +406,7 @@ header-y += telephony.h + header-y += termios.h + header-y += thermal.h + header-y += time.h ++header-y += timerfd.h + header-y += times.h + header-y += timex.h + header-y += tiocl.h +diff --git a/include/uapi/linux/timerfd.h b/include/uapi/linux/timerfd.h +new file mode 100644 +index 000000000000..6fcfaa8da173 +--- /dev/null ++++ b/include/uapi/linux/timerfd.h +@@ -0,0 +1,36 @@ ++/* ++ * include/linux/timerfd.h ++ * ++ * Copyright (C) 2007 Davide Libenzi <davidel@xmailserver.org> ++ * ++ */ ++ ++#ifndef _UAPI_LINUX_TIMERFD_H ++#define _UAPI_LINUX_TIMERFD_H ++ ++#include <linux/types.h> ++ ++/* For O_CLOEXEC and O_NONBLOCK */ ++#include <linux/fcntl.h> ++ ++/* For _IO helpers */ ++#include <linux/ioctl.h> ++ ++/* ++ * CAREFUL: Check include/asm-generic/fcntl.h when defining ++ * new flags, since they might collide with O_* ones. We want ++ * to re-use O_* flags that couldn't possibly have a meaning ++ * from eventfd, in order to leave a free define-space for ++ * shared O_* flags. ++ * ++ * Also make sure to update the masks in include/linux/timerfd.h ++ * when adding new flags. ++ */ ++#define TFD_TIMER_ABSTIME (1 << 0) ++#define TFD_TIMER_CANCEL_ON_SET (1 << 1) ++#define TFD_CLOEXEC O_CLOEXEC ++#define TFD_NONBLOCK O_NONBLOCK ++ ++#define TFD_IOC_SET_TICKS _IOW('T', 0, __u64) ++ ++#endif /* _UAPI_LINUX_TIMERFD_H */ +-- +2.9.0 + diff --git a/4.8/00_all_0008-netlink-drop-int-cast-on-length-arg-in-NLMSG_OK.patch b/4.8/00_all_0008-netlink-drop-int-cast-on-length-arg-in-NLMSG_OK.patch new file mode 100644 index 0000000..f64b51c --- /dev/null +++ b/4.8/00_all_0008-netlink-drop-int-cast-on-length-arg-in-NLMSG_OK.patch @@ -0,0 +1,43 @@ +From 1c92839b48e932d6031302baeda3b9464970fd8c Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Thu, 5 Mar 2015 00:26:58 -0500 +Subject: [PATCH] netlink: drop (int) cast on length arg in NLMSG_OK + +The NLMSG_OK macro compares three things: + - the len arg from the user + - a size_t: sizeof(struct nlmsghdr) + - an int: sizeof(struct nlmsghdr) casted + - an u32: the nlmsghdr->nlmsg_len member + +When building with -Wsign-compare, this macro triggers a signed compare +warning. This is because it compares len to an int, and then compares +it to a u32. If len is signed, we get a warning due to the last test. +If len is unsigned, we get a warning due to the first test. Like in +strace: +socketutils.c:145:8: warning: comparison between signed and unsigned + integer expressions [-Wsign-compare] + +Lets drop the int cast on the first sizeof. This way, once the user +casts len to an unsigned value, everything shakes out correctly. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + include/uapi/linux/netlink.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h +index 0dba4e4ed2be..56b79fbd84dc 100644 +--- a/include/uapi/linux/netlink.h ++++ b/include/uapi/linux/netlink.h +@@ -85,7 +85,7 @@ struct nlmsghdr { + #define NLMSG_DATA(nlh) ((void*)(((char*)nlh) + NLMSG_LENGTH(0))) + #define NLMSG_NEXT(nlh,len) ((len) -= NLMSG_ALIGN((nlh)->nlmsg_len), \ + (struct nlmsghdr*)(((char*)(nlh)) + NLMSG_ALIGN((nlh)->nlmsg_len))) +-#define NLMSG_OK(nlh,len) ((len) >= (int)sizeof(struct nlmsghdr) && \ ++#define NLMSG_OK(nlh,len) ((len) >= sizeof(struct nlmsghdr) && \ + (nlh)->nlmsg_len >= sizeof(struct nlmsghdr) && \ + (nlh)->nlmsg_len <= (len)) + #define NLMSG_PAYLOAD(nlh,len) ((nlh)->nlmsg_len - NLMSG_SPACE((len))) +-- +2.9.0 + diff --git a/4.8/00_all_0009-uapi-mqueue.h-add-missing-linux-types.h-include.patch b/4.8/00_all_0009-uapi-mqueue.h-add-missing-linux-types.h-include.patch new file mode 100644 index 0000000..4fe61ac --- /dev/null +++ b/4.8/00_all_0009-uapi-mqueue.h-add-missing-linux-types.h-include.patch @@ -0,0 +1,43 @@ +From 5c1b68e20b228c287adaa8d1b109b9bea2400e89 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@chromium.org> +Date: Wed, 28 Oct 2015 18:41:33 -0400 +Subject: [PATCH] uapi: mqueue.h: add missing linux/types.h include + +Commit 63159f5dcccb3858d88aaef800c4ee0eb4cc8577 changed the types from +long to __kernel_long_t, but didn't add a linux/types.h include. Code +that tries to include this header directly breaks: + +/usr/include/linux/mqueue.h:26:2: error: unknown type name '__kernel_long_t' + __kernel_long_t mq_flags; /* message queue flags */ + +This also upsets configure tests for this header: +checking linux/mqueue.h usability... no +checking linux/mqueue.h presence... yes +configure: WARNING: linux/mqueue.h: present but cannot be compiled +configure: WARNING: linux/mqueue.h: check for missing prerequisite headers? +configure: WARNING: linux/mqueue.h: see the Autoconf documentation +configure: WARNING: linux/mqueue.h: section "Present But Cannot Be Compiled" +configure: WARNING: linux/mqueue.h: proceeding with the compiler's result +checking for linux/mqueue.h... no + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + include/uapi/linux/mqueue.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/uapi/linux/mqueue.h b/include/uapi/linux/mqueue.h +index d0a2b8e89813..bbd5116ea739 100644 +--- a/include/uapi/linux/mqueue.h ++++ b/include/uapi/linux/mqueue.h +@@ -18,6 +18,8 @@ + #ifndef _LINUX_MQUEUE_H + #define _LINUX_MQUEUE_H + ++#include <linux/types.h> ++ + #define MQ_PRIO_MAX 32768 + /* per-uid limit of kernel memory used by mqueue, in bytes */ + #define MQ_BYTES_MAX 819200 +-- +2.9.0 + diff --git a/4.8/00_all_0010-uapi-fix-System-V-buf-header-includes.patch b/4.8/00_all_0010-uapi-fix-System-V-buf-header-includes.patch new file mode 100644 index 0000000..e312629 --- /dev/null +++ b/4.8/00_all_0010-uapi-fix-System-V-buf-header-includes.patch @@ -0,0 +1,76 @@ +From 4f352dac5953e0484f93e70c273d71795ca9bf8b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 2 Nov 2015 13:30:12 -0500 +Subject: [PATCH] uapi: fix System V buf header includes + +These headers rely on kernel types but don't include the other headers +that define them. So when you try to include them directly, you often +hit build failures due to unknown types. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + include/uapi/asm-generic/ipcbuf.h | 2 ++ + include/uapi/asm-generic/msgbuf.h | 3 +++ + include/uapi/asm-generic/sembuf.h | 2 ++ + include/uapi/asm-generic/shmbuf.h | 2 ++ + 4 files changed, 9 insertions(+) + +diff --git a/include/uapi/asm-generic/ipcbuf.h b/include/uapi/asm-generic/ipcbuf.h +index 3dbcc1e771c0..c37b32ab1304 100644 +--- a/include/uapi/asm-generic/ipcbuf.h ++++ b/include/uapi/asm-generic/ipcbuf.h +@@ -1,6 +1,8 @@ + #ifndef __ASM_GENERIC_IPCBUF_H + #define __ASM_GENERIC_IPCBUF_H + ++#include <linux/types.h> ++ + /* + * The generic ipc64_perm structure: + * Note extra padding because this structure is passed back and forth +diff --git a/include/uapi/asm-generic/msgbuf.h b/include/uapi/asm-generic/msgbuf.h +index f55ecc43c60f..473dcdc305a1 100644 +--- a/include/uapi/asm-generic/msgbuf.h ++++ b/include/uapi/asm-generic/msgbuf.h +@@ -1,7 +1,10 @@ + #ifndef __ASM_GENERIC_MSGBUF_H + #define __ASM_GENERIC_MSGBUF_H + ++#include <linux/types.h> + #include <asm/bitsperlong.h> ++#include <asm/ipcbuf.h> ++ + /* + * generic msqid64_ds structure. + * +diff --git a/include/uapi/asm-generic/sembuf.h b/include/uapi/asm-generic/sembuf.h +index 4cb2c13e5090..f57240f7e6a2 100644 +--- a/include/uapi/asm-generic/sembuf.h ++++ b/include/uapi/asm-generic/sembuf.h +@@ -1,7 +1,9 @@ + #ifndef __ASM_GENERIC_SEMBUF_H + #define __ASM_GENERIC_SEMBUF_H + ++#include <linux/types.h> + #include <asm/bitsperlong.h> ++#include <asm/ipcbuf.h> + + /* + * The semid64_ds structure for x86 architecture. +diff --git a/include/uapi/asm-generic/shmbuf.h b/include/uapi/asm-generic/shmbuf.h +index 7e9fb2f0853b..f9e28e413c3c 100644 +--- a/include/uapi/asm-generic/shmbuf.h ++++ b/include/uapi/asm-generic/shmbuf.h +@@ -1,7 +1,9 @@ + #ifndef __ASM_GENERIC_SHMBUF_H + #define __ASM_GENERIC_SHMBUF_H + ++#include <linux/types.h> + #include <asm/bitsperlong.h> ++#include <asm/ipcbuf.h> + + /* + * The shmid64_ds structure for x86 architecture. +-- +2.9.0 + diff --git a/4.8/00_all_0011-Revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch b/4.8/00_all_0011-Revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch new file mode 100644 index 0000000..6699e0d --- /dev/null +++ b/4.8/00_all_0011-Revert-include-uapi-linux-atm_zatm.h-include-linux-t.patch @@ -0,0 +1,57 @@ +From 144cd02c791dcfc648d76b0027487dd7a2739779 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Thu, 10 Nov 2016 18:35:58 -0500 +Subject: [PATCH] Revert "include/uapi/linux/atm_zatm.h: include linux/time.h" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit cf00713a655d ("include/uapi/linux/atm_zatm.h: include +linux/time.h"). + +This attempted to fix userspace breakage that no longer existed when +the patch was merged. Almost one year earlier, commit 70ba07b675b5 +("atm: remove 'struct zatm_t_hist'") deleted the struct in question. + +After this patch was merged, we now have to deal with people being +unable to include this header in conjunction with standard C library +headers like stdlib.h (which linux-atm does). Example breakage: +x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../.. -I./../q2931 -I./../saal \ + -I. -DCPPFLAGS_TEST -I../../src/include -O2 -march=native -pipe -g \ + -frecord-gcc-switches -freport-bug -Wimplicit-function-declaration \ + -Wnonnull -Wstrict-aliasing -Wparentheses -Warray-bounds \ + -Wfree-nonheap-object -Wreturn-local-addr -fno-strict-aliasing -Wall \ + -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -c zntune.c +In file included from /usr/include/linux/atm_zatm.h:17:0, + from zntune.c:17: +/usr/include/linux/time.h:9:8: error: redefinition of ‘struct timespec’ + struct timespec { + ^ +In file included from /usr/include/sys/select.h:43:0, + from /usr/include/sys/types.h:219, + from /usr/include/stdlib.h:314, + from zntune.c:9: +/usr/include/time.h:120:8: note: originally defined here + struct timespec + ^ + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + include/uapi/linux/atm_zatm.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/include/uapi/linux/atm_zatm.h b/include/uapi/linux/atm_zatm.h +index 5cd4d4d2dd1d..9c9c6ad55f14 100644 +--- a/include/uapi/linux/atm_zatm.h ++++ b/include/uapi/linux/atm_zatm.h +@@ -14,7 +14,6 @@ + + #include <linux/atmapi.h> + #include <linux/atmioc.h> +-#include <linux/time.h> + + #define ZATM_GETPOOL _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc) + /* get pool statistics */ +-- +2.9.0 + |