summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch49
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.19.bb1
2 files changed, 50 insertions, 0 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
new file mode 100644
index 0000000000..3684cc21bf
--- /dev/null
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch
@@ -0,0 +1,49 @@
1From e2c4cf7f98a519eb4d95532bfa06bcaf3562fed5 Mon Sep 17 00:00:00 2001
2From: Davide Caratti <dcaratti@redhat.com>
3Date: Mon, 17 Dec 2018 11:26:38 +0100
4Subject: [PATCH] net: Use __kernel_clockid_t in uapi net_stamp.h
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Herton reports the following error when building a userspace program that
10includes 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
18Fix it by using __kernel_clockid_t in place of clockid_t.
19
20Fixes: 80b14dee2bea ("net: Add a new socket option for a future transmit time.")
21Cc: Timothy Redaelli <tredaelli@redhat.com>
22Reported-by: Herton R. Krzesinski <herton@redhat.com>
23Signed-off-by: Davide Caratti <dcaratti@redhat.com>
24Tested-by: Paolo Abeni <pabeni@redhat.com>
25Signed-off-by: David S. Miller <davem@davemloft.net>
26---
27Upstream-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
32diff --git a/include/uapi/linux/net_tstamp.h b/include/uapi/linux/net_tstamp.h
33index 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--
482.20.1
49
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.19.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.19.bb
index 8fd427efef..48f25ebc1a 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.19.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.19.bb
@@ -10,6 +10,7 @@ SRC_URI_append_libc-musl = "\
10 " 10 "
11 11
12SRC_URI_append = "\ 12SRC_URI_append = "\
13 file://0001-net-Use-__kernel_clockid_t-in-uapi-net_stamp.h.patch \
13 file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \ 14 file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \
14 file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \ 15 file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \
15 file://0002-arm64-sve-ptrace-Fix-SVE_PT_REGS_OFFSET-definition.patch \ 16 file://0002-arm64-sve-ptrace-Fix-SVE_PT_REGS_OFFSET-definition.patch \