Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 9708dc74d9f49488d669e070982f6224a888d61a Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 12 Sep 2018 17:08:58 -0700 |
| 4 | Subject: [PATCH] include linux/stddef.h in swab.h uapi header |
| 5 | |
| 6 | swab.h uses __always_inline without including the header where it is |
| 7 | defined, this is exposed by musl based distributions where this macro is |
| 8 | not defined by system C library headers unlike glibc where it is defined |
| 9 | in sys/cdefs.h and that header gets pulled in indirectly via |
| 10 | |
| 11 | features.h -> sys/cdefs.h |
| 12 | |
| 13 | and features.h gets pulled in a lot of headers. Therefore it may work in |
| 14 | cases where features.h is includes but not otherwise. |
| 15 | |
| 16 | Adding linux/stddef.h here ensures that __always_inline is always |
| 17 | defined independent of which C library is used in userspace |
| 18 | |
| 19 | Upstream-Status: Submitted [https://lkml.org/lkml/2018/9/13/78] |
| 20 | |
| 21 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 22 | Cc: Philippe Ombredanne <pombredanne@nexb.com> |
| 23 | Cc: Kate Stewart <kstewart@linuxfoundation.org> |
| 24 | Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 25 | Cc: Thomas Gleixner <tglx@linutronix.de> |
| 26 | --- |
| 27 | include/uapi/linux/swab.h | 1 + |
| 28 | 1 file changed, 1 insertion(+) |
| 29 | |
| 30 | diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h |
| 31 | index 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 | -- |
| 43 | 2.19.0 |
| 44 | |