oasis

commit: 7a3b81ed5f3d4707f0cdacdc01d0c90816e4be30
parent 94c668eea3872e8e5c6f308021037b13f550a529
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 29 Apr 2021 01:17:45 -0700

linux-headers: Add patch to fix use of __always_inline in swab.h

Diffstat:
A
pkg/linux-headers/patch/0003-include-uapi-linux-swab-Fix-potentially-missing-__al.patch
55
+++++++++++++++++++++++++++++++++++++++++++++++++++++++
M
pkg/linux-headers/ver
2
+-

2 files changed, 56 insertions(+), 1 deletion(-)
diff --git a/pkg/linux-headers/patch/0003-include-uapi-linux-swab-Fix-potentially-missing-__al.patch b/pkg/linux-headers/patch/0003-include-uapi-linux-swab-Fix-potentially-missing-__al.patch
@@ -0,0 +1,55 @@
+From f9d4ca2669a3f5b5f47de1bc31129fa2dd6f1597 Mon Sep 17 00:00:00 2001
+From: Matt Redfearn <matt.redfearn@mips.com>
+Date: Thu, 29 Apr 2021 01:14:38 -0700
+Subject: [PATCH] include/uapi/linux/swab: Fix potentially missing
+ __always_inline
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit bc27fb68aaad ("include/uapi/linux/byteorder, swab: force inlining
+of some byteswap operations") added __always_inline to swab functions
+and commit 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to
+userspace headers") added a definition of __always_inline for use in
+exported headers when the kernel's compiler.h is not available.
+
+However, since swab.h does not include stddef.h, if the header soup does
+not indirectly include it, the definition of __always_inline is missing,
+resulting in a compilation failure, which was observed compiling the
+perf tool using exported headers containing this commit:
+
+In file included from /usr/include/linux/byteorder/little_endian.h:12:0,
+                 from /usr/include/asm/byteorder.h:14,
+                 from tools/include/uapi/linux/perf_event.h:20,
+                 from perf.h:8,
+                 from builtin-bench.c:18:
+/usr/include/linux/swab.h:160:8: error: unknown type name ‘__always_inline’
+ static __always_inline __u16 __swab16p(const __u16 *p)
+
+Fix this by replacing the inclusion of linux/compiler.h with
+linux/stddef.h to ensure that we pick up that definition if required,
+without relying on it's indirect inclusion. compiler.h is then included
+indirectly, via stddef.h.
+
+Fixes: 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to userspace headers")
+Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
+---
+ include/uapi/linux/swab.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
+index 7272f85d6d6a..3736f2fe1541 100644
+--- a/include/uapi/linux/swab.h
++++ b/include/uapi/linux/swab.h
+@@ -3,7 +3,7 @@
+ #define _UAPI_LINUX_SWAB_H
+ 
+ #include <linux/types.h>
+-#include <linux/compiler.h>
++#include <linux/stddef.h>
+ #include <asm/bitsperlong.h>
+ #include <asm/swab.h>
+ 
+-- 
+2.31.1
+
diff --git a/pkg/linux-headers/ver b/pkg/linux-headers/ver
@@ -1 +1 @@
-5.12 r0
+5.12 r1