Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/gentoo-headers/3.18: 00_all_0001-linux-stat.h-remove-__GLIBC__-checks.patch 00_all_0002-netfilter-pull-in-limits.h.patch 00_all_0003-convert-PAGE_SIZE-usage.patch 00_all_0004-asm-generic-fcntl.h-namespace-kernel-file-structs.patch 00_all_0005-unifdef-drop-unused-errno.h-include.patch 00_all_0006-x86-do-not-build-relocs-tool-when-installing-headers.patch 00_all_0007-timerfd-export-defines-to-userspace.patch
Date: Wed, 31 Dec 2014 01:57:58
Message-Id: 20141231015754.04254E88D@oystercatcher.gentoo.org
1 vapier 14/12/31 01:57:54
2
3 Added:
4 00_all_0001-linux-stat.h-remove-__GLIBC__-checks.patch
5 00_all_0002-netfilter-pull-in-limits.h.patch
6 00_all_0003-convert-PAGE_SIZE-usage.patch
7 00_all_0004-asm-generic-fcntl.h-namespace-kernel-file-structs.patch
8 00_all_0005-unifdef-drop-unused-errno.h-include.patch
9 00_all_0006-x86-do-not-build-relocs-tool-when-installing-headers.patch
10 00_all_0007-timerfd-export-defines-to-userspace.patch
11 Log:
12 initial 3.18 patchset based on last 3.17 patchset
13
14 Revision Changes Path
15 1.1 src/patchsets/gentoo-headers/3.18/00_all_0001-linux-stat.h-remove-__GLIBC__-checks.patch
16
17 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.18/00_all_0001-linux-stat.h-remove-__GLIBC__-checks.patch?rev=1.1&view=markup
18 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.18/00_all_0001-linux-stat.h-remove-__GLIBC__-checks.patch?rev=1.1&content-type=text/plain
19
20 Index: 00_all_0001-linux-stat.h-remove-__GLIBC__-checks.patch
21 ===================================================================
22 From 8a8355bbc116cdde94c8f13bfa4ad9b87ce5d518 Mon Sep 17 00:00:00 2001
23 From: Mike Frysinger <vapier@g.o>
24 Date: Mon, 29 Dec 2008 06:52:59 -0500
25 Subject: [PATCH] linux/stat.h: remove __GLIBC__ checks
26
27 Only check __KERNEL__ so we don't assume the C library is glibc.
28
29 Signed-off-by: Mike Frysinger <vapier@g.o>
30 ---
31 include/uapi/linux/stat.h | 2 +-
32 1 file changed, 1 insertion(+), 1 deletion(-)
33
34 diff --git a/include/uapi/linux/stat.h b/include/uapi/linux/stat.h
35 index 7fec7e3..256ad24 100644
36 --- a/include/uapi/linux/stat.h
37 +++ b/include/uapi/linux/stat.h
38 @@ -2,7 +2,7 @@
39 #define _UAPI_LINUX_STAT_H
40
41
42 -#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
43 +#if defined(__KERNEL__)
44
45 #define S_IFMT 00170000
46 #define S_IFSOCK 0140000
47 --
48 2.1.3
49
50
51
52
53 1.1 src/patchsets/gentoo-headers/3.18/00_all_0002-netfilter-pull-in-limits.h.patch
54
55 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.18/00_all_0002-netfilter-pull-in-limits.h.patch?rev=1.1&view=markup
56 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.18/00_all_0002-netfilter-pull-in-limits.h.patch?rev=1.1&content-type=text/plain
57
58 Index: 00_all_0002-netfilter-pull-in-limits.h.patch
59 ===================================================================
60 From 3b97f3a2ca8761de559d91cb99a370424201535c Mon Sep 17 00:00:00 2001
61 From: Mike Frysinger <vapier@g.o>
62 Date: Sat, 9 May 2009 17:30:35 -0400
63 Subject: [PATCH] netfilter: pull in limits.h
64
65 A few netfilter sub-headers use INT_MAX which is in limits.h.
66
67 URL: http://bugs.gentoo.org/246160
68 Signed-off-by: Mike Frysinger <vapier@g.o>
69 ---
70 include/uapi/linux/netfilter.h | 1 +
71 1 file changed, 1 insertion(+)
72
73 diff --git a/include/uapi/linux/netfilter.h b/include/uapi/linux/netfilter.h
74 index ef1b1f8..dda752c 100644
75 --- a/include/uapi/linux/netfilter.h
76 +++ b/include/uapi/linux/netfilter.h
77 @@ -4,6 +4,7 @@
78 #include <linux/types.h>
79 #include <linux/compiler.h>
80 #include <linux/sysctl.h>
81 +#include <limits.h>
82
83
84 /* Responses from hook functions. */
85 --
86 2.1.3
87
88
89
90
91 1.1 src/patchsets/gentoo-headers/3.18/00_all_0003-convert-PAGE_SIZE-usage.patch
92
93 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.18/00_all_0003-convert-PAGE_SIZE-usage.patch?rev=1.1&view=markup
94 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.18/00_all_0003-convert-PAGE_SIZE-usage.patch?rev=1.1&content-type=text/plain
95
96 Index: 00_all_0003-convert-PAGE_SIZE-usage.patch
97 ===================================================================
98 From 530d762665c414470db375018471be27e4b3c239 Mon Sep 17 00:00:00 2001
99 From: Mike Frysinger <vapier@g.o>
100 Date: Sat, 13 Feb 2010 03:09:23 -0500
101 Subject: [PATCH] convert PAGE_SIZE usage
102
103 The size of a page may change at runtime or based on kernel settings, so
104 a static value at compile time doesn't work. More importantly, no one
105 exports PAGE_SIZE to user space anymore.
106
107 URL: http://bugs.gentoo.org/301431
108 Signed-off-by: Mike Frysinger <vapier@g.o>
109 ---
110 include/uapi/linux/binfmts.h | 3 ++-
111 include/uapi/linux/resource.h | 3 ++-
112 2 files changed, 4 insertions(+), 2 deletions(-)
113
114 diff --git a/include/uapi/linux/binfmts.h b/include/uapi/linux/binfmts.h
115 index 4eb5972..516bfcf 100644
116 --- a/include/uapi/linux/binfmts.h
117 +++ b/include/uapi/linux/binfmts.h
118 @@ -1,6 +1,7 @@
119 #ifndef _UAPI_LINUX_BINFMTS_H
120 #define _UAPI_LINUX_BINFMTS_H
121
122 +#include <unistd.h>
123 #include <linux/capability.h>
124
125 struct pt_regs;
126 @@ -11,7 +12,7 @@ struct pt_regs;
127 * prevent the kernel from being unduly impacted by misaddressed pointers.
128 * MAX_ARG_STRINGS is chosen to fit in a signed 32-bit integer.
129 */
130 -#define MAX_ARG_STRLEN (PAGE_SIZE * 32)
131 +#define MAX_ARG_STRLEN (sysconf(_SC_PAGESIZE) * 32)
132 #define MAX_ARG_STRINGS 0x7FFFFFFF
133
134 /* sizeof(linux_binprm->buf) */
135 diff --git a/include/uapi/linux/resource.h b/include/uapi/linux/resource.h
136 index 36fb3b5..58efd07 100644
137 --- a/include/uapi/linux/resource.h
138 +++ b/include/uapi/linux/resource.h
139 @@ -68,7 +68,8 @@ struct rlimit64 {
140 * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
141 * and other sensitive information are never written to disk.
142 */
143 -#define MLOCK_LIMIT ((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024)
144 +/* No one currently defines PAGE_SIZE bigger than 64kB */
145 +#define MLOCK_LIMIT (64 * 1024)
146
147 /*
148 * Due to binary compatibility, the actual resource numbers
149 --
150 2.1.3
151
152
153
154
155 1.1 src/patchsets/gentoo-headers/3.18/00_all_0004-asm-generic-fcntl.h-namespace-kernel-file-structs.patch
156
157 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.18/00_all_0004-asm-generic-fcntl.h-namespace-kernel-file-structs.patch?rev=1.1&view=markup
158 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.18/00_all_0004-asm-generic-fcntl.h-namespace-kernel-file-structs.patch?rev=1.1&content-type=text/plain
159
160 Index: 00_all_0004-asm-generic-fcntl.h-namespace-kernel-file-structs.patch
161 ===================================================================
162 From fc3220c575821883f25f7b54ea542c2cd5987cfd Mon Sep 17 00:00:00 2001
163 From: Mike Frysinger <vapier@g.o>
164 Date: Mon, 29 Dec 2008 07:39:14 -0500
165 Subject: [PATCH] asm-generic/fcntl.h: namespace kernel file structs
166
167 No one should be using these structs, but just in case they are,
168 keep them available in the __kernel_ namespace.
169
170 Otherwise, trying to include something like:
171 #include <fcntl.h>
172 #include <linux/inotify.h>
173 leads to horrible failure.
174
175 URL: http://bugs.gentoo.org/244470
176 URL: http://bugs.gentoo.org/388633
177 Signed-off-by: Mike Frysinger <vapier@g.o>
178 ---
179 include/uapi/asm-generic/fcntl.h | 6 +++---
180 1 file changed, 3 insertions(+), 3 deletions(-)
181
182 diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h
183 index 7543b3e..5bdac877 100644
184 --- a/include/uapi/asm-generic/fcntl.h
185 +++ b/include/uapi/asm-generic/fcntl.h
186 @@ -152,7 +152,7 @@
187 #define F_OWNER_PID 1
188 #define F_OWNER_PGRP 2
189
190 -struct f_owner_ex {
191 +struct __kernel_f_owner_ex {
192 int type;
193 __kernel_pid_t pid;
194 };
195 @@ -192,7 +192,7 @@ struct f_owner_ex {
196 #define __ARCH_FLOCK_PAD
197 #endif
198
199 -struct flock {
200 +struct __kernel_flock {
201 short l_type;
202 short l_whence;
203 __kernel_off_t l_start;
204 @@ -207,7 +207,7 @@ struct flock {
205 #define __ARCH_FLOCK64_PAD
206 #endif
207
208 -struct flock64 {
209 +struct __kernel_flock64 {
210 short l_type;
211 short l_whence;
212 __kernel_loff_t l_start;
213 --
214 2.1.3
215
216
217
218
219 1.1 src/patchsets/gentoo-headers/3.18/00_all_0005-unifdef-drop-unused-errno.h-include.patch
220
221 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.18/00_all_0005-unifdef-drop-unused-errno.h-include.patch?rev=1.1&view=markup
222 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.18/00_all_0005-unifdef-drop-unused-errno.h-include.patch?rev=1.1&content-type=text/plain
223
224 Index: 00_all_0005-unifdef-drop-unused-errno.h-include.patch
225 ===================================================================
226 From 178ea167595a88ea3f2dcf20821ce62f1fdc2bb2 Mon Sep 17 00:00:00 2001
227 From: Mike Frysinger <vapier@g.o>
228 Date: Tue, 6 Dec 2011 17:22:42 -0500
229 Subject: [PATCH] unifdef: drop unused errno.h include
230
231 This is the only header on my system that ends up requiring kernel
232 headers, so if the kernel headers aren't available, we end up being
233 unable to install kernel headers :).
234
235 Since this file doesn't actually use anything from errno.h, drop
236 the include so it at least makes us a bit more robust on glibc.
237
238 Signed-off-by: Mike Frysinger <vapier@g.o>
239 ---
240 scripts/unifdef.c | 1 -
241 1 file changed, 1 deletion(-)
242
243 diff --git a/scripts/unifdef.c b/scripts/unifdef.c
244 index 7493c0e..c5dfae5 100644
245 --- a/scripts/unifdef.c
246 +++ b/scripts/unifdef.c
247 @@ -48,7 +48,6 @@
248
249 #include <ctype.h>
250 #include <err.h>
251 -#include <errno.h>
252 #include <stdarg.h>
253 #include <stdbool.h>
254 #include <stdio.h>
255 --
256 2.1.3
257
258
259
260
261 1.1 src/patchsets/gentoo-headers/3.18/00_all_0006-x86-do-not-build-relocs-tool-when-installing-headers.patch
262
263 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.18/00_all_0006-x86-do-not-build-relocs-tool-when-installing-headers.patch?rev=1.1&view=markup
264 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.18/00_all_0006-x86-do-not-build-relocs-tool-when-installing-headers.patch?rev=1.1&content-type=text/plain
265
266 Index: 00_all_0006-x86-do-not-build-relocs-tool-when-installing-headers.patch
267 ===================================================================
268 From 1fae43bfd87b1a72bbd1060dc6407d601238526e Mon Sep 17 00:00:00 2001
269 From: Mike Frysinger <vapier@g.o>
270 Date: Sat, 15 Nov 2014 03:37:38 -0500
271 Subject: [PATCH] x86: do not build relocs tool when installing headers
272
273 This isn't needed to install headers, so don't bother building it.
274 Otherwise we run into a chicken/egg issue where we need the kernel
275 headers in order to install the kernel headers. It's also a waste
276 of time.
277
278 Signed-off-by: Mike Frysinger <vapier@g.o>
279 ---
280 arch/x86/Makefile | 2 ++
281 1 file changed, 2 insertions(+)
282
283 diff --git a/arch/x86/Makefile b/arch/x86/Makefile
284 index 920e616..071a14d 100644
285 --- a/arch/x86/Makefile
286 +++ b/arch/x86/Makefile
287 @@ -170,8 +170,10 @@ KBUILD_CFLAGS += $(call cc-option,-mno-avx,)
288 KBUILD_CFLAGS += $(mflags-y)
289 KBUILD_AFLAGS += $(mflags-y)
290
291 +ifneq ($(filter-out headers_install,$(MAKECMDGOALS)),)
292 archscripts: scripts_basic
293 $(Q)$(MAKE) $(build)=arch/x86/tools relocs
294 +endif
295
296 ###
297 # Syscall table generation
298 --
299 2.1.3
300
301
302
303
304 1.1 src/patchsets/gentoo-headers/3.18/00_all_0007-timerfd-export-defines-to-userspace.patch
305
306 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.18/00_all_0007-timerfd-export-defines-to-userspace.patch?rev=1.1&view=markup
307 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gentoo-headers/3.18/00_all_0007-timerfd-export-defines-to-userspace.patch?rev=1.1&content-type=text/plain
308
309 Index: 00_all_0007-timerfd-export-defines-to-userspace.patch
310 ===================================================================
311 From 9ca162697e0d7a353e3a137c1f489b7f3e3ec7de Mon Sep 17 00:00:00 2001
312 From: Mike Frysinger <vapier@g.o>
313 Date: Tue, 30 Dec 2014 19:14:51 -0500
314 Subject: [PATCH] timerfd: export defines to userspace
315
316 Since userspace is expected to call timerfd syscalls directly with these
317 flags/ioctls, make sure we export them so they don't have to duplicate
318 the values themselves.
319
320 Signed-off-by: Mike Frysinger <vapier@g.o>
321 ---
322 include/linux/timerfd.h | 20 +-------------------
323 include/uapi/linux/Kbuild | 1 +
324 include/uapi/linux/timerfd.h | 36 ++++++++++++++++++++++++++++++++++++
325 3 files changed, 38 insertions(+), 19 deletions(-)
326 create mode 100644 include/uapi/linux/timerfd.h
327
328 diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
329 index 8523f9b..62ac5e7 100644
330 --- a/include/uapi/linux/Kbuild
331 +++ b/include/uapi/linux/Kbuild
332 @@ -384,6 +384,7 @@ header-y += tcp_metrics.h
333 header-y += telephony.h
334 header-y += termios.h
335 header-y += time.h
336 +header-y += timerfd.h
337 header-y += times.h
338 header-y += timex.h
339 header-y += tiocl.h
340 diff --git a/include/uapi/linux/timerfd.h b/include/uapi/linux/timerfd.h
341 new file mode 100644
342 index 0000000..6fcfaa8
343 --- /dev/null
344 +++ b/include/uapi/linux/timerfd.h
345 @@ -0,0 +1,36 @@
346 +/*
347 + * include/linux/timerfd.h
348 + *
349 + * Copyright (C) 2007 Davide Libenzi <davidel@×××××××××××.org>
350 + *
351 + */
352 +
353 +#ifndef _UAPI_LINUX_TIMERFD_H
354 +#define _UAPI_LINUX_TIMERFD_H
355 +
356 +#include <linux/types.h>
357 +
358 +/* For O_CLOEXEC and O_NONBLOCK */
359 +#include <linux/fcntl.h>
360 +
361 +/* For _IO helpers */
362 +#include <linux/ioctl.h>
363 +
364 +/*
365 + * CAREFUL: Check include/asm-generic/fcntl.h when defining
366 + * new flags, since they might collide with O_* ones. We want
367 + * to re-use O_* flags that couldn't possibly have a meaning
368 + * from eventfd, in order to leave a free define-space for
369 + * shared O_* flags.
370 + *
371 + * Also make sure to update the masks in include/linux/timerfd.h
372 + * when adding new flags.
373 + */
374 +#define TFD_TIMER_ABSTIME (1 << 0)
375 +#define TFD_TIMER_CANCEL_ON_SET (1 << 1)
376 +#define TFD_CLOEXEC O_CLOEXEC
377 +#define TFD_NONBLOCK O_NONBLOCK
378 +
379 +#define TFD_IOC_SET_TICKS _IOW('T', 0, __u64)
380 +
381 +#endif /* _UAPI_LINUX_TIMERFD_H */
382 --
383 2.1.3