diff options
author | 2014-06-15 01:27:08 +0100 | |
---|---|---|
committer | 2014-06-15 01:27:08 +0100 | |
commit | a18e31cc465d85cdb733ea9a7554a80fb4d99260 (patch) | |
tree | 1d900496ddcfea463f6cb822904b08fd7450e66a /3.15 | |
parent | initial 3.14 patchset based on last 3.13 patchset (diff) | |
download | linux-headers-patches-a18e31cc465d85cdb733ea9a7554a80fb4d99260.tar.gz linux-headers-patches-a18e31cc465d85cdb733ea9a7554a80fb4d99260.tar.bz2 linux-headers-patches-a18e31cc465d85cdb733ea9a7554a80fb4d99260.zip |
initial 3.15 patchset based on last 3.14 patchset
Diffstat (limited to '3.15')
7 files changed, 257 insertions, 0 deletions
diff --git a/3.15/00_all_0001-linux-stat.h-remove-__GLIBC__-checks.patch b/3.15/00_all_0001-linux-stat.h-remove-__GLIBC__-checks.patch new file mode 100644 index 0000000..32d3d92 --- /dev/null +++ b/3.15/00_all_0001-linux-stat.h-remove-__GLIBC__-checks.patch @@ -0,0 +1,28 @@ +From b471a627585270ffb8142ebd30c0ac73bb2680f5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 29 Dec 2008 06:52:59 -0500 +Subject: [PATCH 1/7] 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 7fec7e3..256ad24 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.0.0 + diff --git a/3.15/00_all_0002-netfilter-pull-in-limits.h.patch b/3.15/00_all_0002-netfilter-pull-in-limits.h.patch new file mode 100644 index 0000000..7b5e5d5 --- /dev/null +++ b/3.15/00_all_0002-netfilter-pull-in-limits.h.patch @@ -0,0 +1,28 @@ +From 685e48df783bd55fb8553e0801003357b935b195 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 9 May 2009 17:30:35 -0400 +Subject: [PATCH 2/7] 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 ef1b1f8..dda752c 100644 +--- a/include/uapi/linux/netfilter.h ++++ b/include/uapi/linux/netfilter.h +@@ -4,6 +4,7 @@ + #include <linux/types.h> + #include <linux/compiler.h> + #include <linux/sysctl.h> ++#include <limits.h> + + + /* Responses from hook functions. */ +-- +2.0.0 + diff --git a/3.15/00_all_0003-convert-PAGE_SIZE-usage.patch b/3.15/00_all_0003-convert-PAGE_SIZE-usage.patch new file mode 100644 index 0000000..5f84601 --- /dev/null +++ b/3.15/00_all_0003-convert-PAGE_SIZE-usage.patch @@ -0,0 +1,54 @@ +From 98b1c53d3e72e039b940f56d1df48939c9e12e3b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 13 Feb 2010 03:09:23 -0500 +Subject: [PATCH 3/7] 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 4eb5972..516bfcf 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 36fb3b5..58efd07 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.0.0 + diff --git a/3.15/00_all_0004-asm-generic-fcntl.h-namespace-kernel-file-structs.patch b/3.15/00_all_0004-asm-generic-fcntl.h-namespace-kernel-file-structs.patch new file mode 100644 index 0000000..c930313 --- /dev/null +++ b/3.15/00_all_0004-asm-generic-fcntl.h-namespace-kernel-file-structs.patch @@ -0,0 +1,54 @@ +From fd2ca5a891ffc19d6aa5d1eceeca6e59bdb6eaa3 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 29 Dec 2008 07:39:14 -0500 +Subject: [PATCH 4/7] 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 7543b3e..5bdac87 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.0.0 + diff --git a/3.15/00_all_0005-unifdef-drop-unused-errno.h-include.patch b/3.15/00_all_0005-unifdef-drop-unused-errno.h-include.patch new file mode 100644 index 0000000..979ec09 --- /dev/null +++ b/3.15/00_all_0005-unifdef-drop-unused-errno.h-include.patch @@ -0,0 +1,32 @@ +From 6e026d564ab6e5850e090a630de19fb3b4bc92d8 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Tue, 6 Dec 2011 17:22:42 -0500 +Subject: [PATCH 5/7] 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 7493c0e..c5dfae5 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.0.0 + diff --git a/3.15/00_all_0006-x86-make-statfs-64-bit-for-x86_64-kernels.patch b/3.15/00_all_0006-x86-make-statfs-64-bit-for-x86_64-kernels.patch new file mode 100644 index 0000000..ca1bd05 --- /dev/null +++ b/3.15/00_all_0006-x86-make-statfs-64-bit-for-x86_64-kernels.patch @@ -0,0 +1,32 @@ +From 4a8b69f031fc152c8b36b951d2f6edcbcd66502b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 25 Mar 2013 16:38:47 -0400 +Subject: [PATCH 6/7] x86: make statfs 64-bit for x86_64 kernels + +When including these headers in the x32 ABI, the structs get declared +with 32bit sizes which is incorrect. The stat.h change has been merged +now, but statfs.h is still missing. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + arch/x86/include/uapi/asm/statfs.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/arch/x86/include/uapi/asm/statfs.h b/arch/x86/include/uapi/asm/statfs.h +index 2d0adbf..3cb5744 100644 +--- a/arch/x86/include/uapi/asm/statfs.h ++++ b/arch/x86/include/uapi/asm/statfs.h +@@ -8,5 +8,10 @@ + */ + #define ARCH_PACK_COMPAT_STATFS64 __attribute__((packed,aligned(4))) + ++/* For x86-64, both the 64bit and x32 ABIs have 64bit fields. */ ++#ifdef __x86_64__ ++#define __statfs_word __u64 ++#endif ++ + #include <asm-generic/statfs.h> + #endif /* _ASM_X86_STATFS_H */ +-- +2.0.0 + diff --git a/3.15/00_all_0007-uapi-netfilter_arp-use-__u8-instead-of-u_int8_t.patch b/3.15/00_all_0007-uapi-netfilter_arp-use-__u8-instead-of-u_int8_t.patch new file mode 100644 index 0000000..9da832d --- /dev/null +++ b/3.15/00_all_0007-uapi-netfilter_arp-use-__u8-instead-of-u_int8_t.patch @@ -0,0 +1,29 @@ +From ed0665d1cbb56cf33c5da8517193a57a1e92f04a Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Tue, 21 Jan 2014 21:39:24 -0500 +Subject: [PATCH 7/7] uapi: netfilter_arp: use __u8 instead of u_int8_t + +Similarly, the u_int8_t type is non-standard and not defined. Change +it to use __u8 like the rest of the netfilter headers. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + include/uapi/linux/netfilter_arp/arpt_mangle.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/uapi/linux/netfilter_arp/arpt_mangle.h b/include/uapi/linux/netfilter_arp/arpt_mangle.h +index 250f502..8c2b16a 100644 +--- a/include/uapi/linux/netfilter_arp/arpt_mangle.h ++++ b/include/uapi/linux/netfilter_arp/arpt_mangle.h +@@ -13,7 +13,7 @@ struct arpt_mangle + union { + struct in_addr tgt_ip; + } u_t; +- u_int8_t flags; ++ __u8 flags; + int target; + }; + +-- +2.0.0 + |