summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-09-12 18:05:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-13 17:38:07 +0100
commita906da83f4ab987e54704b280180832df6dce660 (patch)
treea35ddde5d07f5c48051bea1cd48744c2f1aef7da
parent069829248b14d89937e48026c8e6b9f05dbeb9c9 (diff)
downloadpoky-a906da83f4ab987e54704b280180832df6dce660.tar.gz
linux-libc-headers: Include linux/stddef.h in linux/swab.h
This helps compiling bpf tests using non-glibc C libraries e.g. musl (From OE-Core rev: 5f1895fb94d35a1496f22863791ad6f7a6aca97a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch44
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb1
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch
new file mode 100644
index 0000000000..9d17daa70f
--- /dev/null
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-include-linux-stddef.h-in-swab.h-uapi-header.patch
@@ -0,0 +1,44 @@
1From 9708dc74d9f49488d669e070982f6224a888d61a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 12 Sep 2018 17:08:58 -0700
4Subject: [PATCH] include linux/stddef.h in swab.h uapi header
5
6swab.h uses __always_inline without including the header where it is
7defined, this is exposed by musl based distributions where this macro is
8not defined by system C library headers unlike glibc where it is defined
9in sys/cdefs.h and that header gets pulled in indirectly via
10
11features.h -> sys/cdefs.h
12
13and features.h gets pulled in a lot of headers. Therefore it may work in
14cases where features.h is includes but not otherwise.
15
16Adding linux/stddef.h here ensures that __always_inline is always
17defined independent of which C library is used in userspace
18
19Upstream-Status: Submitted [https://lkml.org/lkml/2018/9/13/78]
20
21Signed-off-by: Khem Raj <raj.khem@gmail.com>
22Cc: Philippe Ombredanne <pombredanne@nexb.com>
23Cc: Kate Stewart <kstewart@linuxfoundation.org>
24Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
25Cc: Thomas Gleixner <tglx@linutronix.de>
26---
27 include/uapi/linux/swab.h | 1 +
28 1 file changed, 1 insertion(+)
29
30diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
31index 23cd84868cc3..acddbe50a20d 100644
32--- a/include/uapi/linux/swab.h
33+++ b/include/uapi/linux/swab.h
34@@ -3,6 +3,7 @@
35 #define _UAPI_LINUX_SWAB_H
36
37 #include <linux/types.h>
38+#include <linux/stddef.h>
39 #include <linux/compiler.h>
40 #include <asm/swab.h>
41
42--
432.19.0
44
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb
index e38872bb91..eb7bee72b0 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb
@@ -6,6 +6,7 @@ SRC_URI_append_libc-musl = "\
6 file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ 6 file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \
7 file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ 7 file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \
8 file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \ 8 file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \
9 file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \
9 " 10 "
10 11
11SRC_URI[md5sum] = "bee5fe53ee1c3142b8f0c12c0d3348f9" 12SRC_URI[md5sum] = "bee5fe53ee1c3142b8f0c12c0d3348f9"