diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-03-06 11:37:10 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-06 16:44:37 +0000 |
commit | c2fecb0a513cfe5ddf75bfe24e98dec15dab3adc (patch) | |
tree | 8f84d32b48206c9319673f74fd1610d9f0d7ab9f /meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch | |
parent | 04bfce60c8c8e4d0ba17460e89d7a6d3d071c147 (diff) | |
download | poky-c2fecb0a513cfe5ddf75bfe24e98dec15dab3adc.tar.gz |
linux-libc-headers: update to 5.x headers
Updating the linux-libc-headers to the 5.x kernel variant to match
the latest reference kernel in the 2.7 release.
We have two patches refreshed for context changes, and three patches
dropped since they have been merged to the mainline kernel and are
no longer necessary.
(From OE-Core rev: f6c825c41e3d4c14ae4ba0b2a07cc41d538e0d61)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch')
-rw-r--r-- | meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch deleted file mode 100644 index 3684cc21bf..0000000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From e2c4cf7f98a519eb4d95532bfa06bcaf3562fed5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Davide Caratti <dcaratti@redhat.com> | ||
3 | Date: Mon, 17 Dec 2018 11:26:38 +0100 | ||
4 | Subject: [PATCH] net: Use __kernel_clockid_t in uapi net_stamp.h | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Herton reports the following error when building a userspace program that | ||
10 | includes net_stamp.h: | ||
11 | |||
12 | In file included from foo.c:2: | ||
13 | /usr/include/linux/net_tstamp.h:158:2: error: unknown type name | ||
14 | ‘clockid_t’ | ||
15 | clockid_t clockid; /* reference clockid */ | ||
16 | ^~~~~~~~~ | ||
17 | |||
18 | Fix it by using __kernel_clockid_t in place of clockid_t. | ||
19 | |||
20 | Fixes: 80b14dee2bea ("net: Add a new socket option for a future transmit time.") | ||
21 | Cc: Timothy Redaelli <tredaelli@redhat.com> | ||
22 | Reported-by: Herton R. Krzesinski <herton@redhat.com> | ||
23 | Signed-off-by: Davide Caratti <dcaratti@redhat.com> | ||
24 | Tested-by: Paolo Abeni <pabeni@redhat.com> | ||
25 | Signed-off-by: David S. Miller <davem@davemloft.net> | ||
26 | --- | ||
27 | Upstream-Status: Backport [https://github.com/torvalds/linux/commit/e2c4cf7f98a519eb4d95532bfa06bcaf3562fed5] | ||
28 | |||
29 | include/uapi/linux/net_tstamp.h | 4 ++-- | ||
30 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
31 | |||
32 | diff --git a/include/uapi/linux/net_tstamp.h b/include/uapi/linux/net_tstamp.h | ||
33 | index 97ff3c17ec4d..e5b39721c6e4 100644 | ||
34 | --- a/include/uapi/linux/net_tstamp.h | ||
35 | +++ b/include/uapi/linux/net_tstamp.h | ||
36 | @@ -155,8 +155,8 @@ enum txtime_flags { | ||
37 | }; | ||
38 | |||
39 | struct sock_txtime { | ||
40 | - clockid_t clockid; /* reference clockid */ | ||
41 | - __u32 flags; /* as defined by enum txtime_flags */ | ||
42 | + __kernel_clockid_t clockid;/* reference clockid */ | ||
43 | + __u32 flags; /* as defined by enum txtime_flags */ | ||
44 | }; | ||
45 | |||
46 | #endif /* _NET_TIMESTAMPING_H */ | ||
47 | -- | ||
48 | 2.20.1 | ||
49 | |||