mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-19 17:26:28 +00:00
Add a patch that ensures that bcc can run on the 5.3.x kernel.
Signed-off-by: Krister Johansen <krister.johansen@oracle.com>
This commit is contained in:
parent
59481bd5d3
commit
dad20f2e91
@ -0,0 +1,55 @@
|
||||
From 8d4b24575143777bf185e659c280be2cec3ff9b0 Mon Sep 17 00:00:00 2001
|
||||
From: Matt Redfearn <matt.redfearn@mips.com>
|
||||
Date: Wed, 3 Jan 2018 09:57:30 +0000
|
||||
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 23cd84868cc3..f6a8cf737abf 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/swab.h>
|
||||
|
||||
/*
|
||||
--
|
||||
2.24.0
|
||||
|
Loading…
Reference in New Issue
Block a user