blob: 9d17daa70f08312aa016fae17a8be48c05b4bc2d [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 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