From d4f1a39aeac63da7ed94598857f1a49276467f03 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 4 Jan 2021 11:34:38 +0100 Subject: [PATCH] 5.4-stable patches added patches: tools-headers-uapi-sync-linux-const.h-with-the-kernel-headers.patch uapi-move-constants-from-linux-kernel.h-to-linux-const.h.patch --- queue-5.4/series | 2 + ...inux-const.h-with-the-kernel-headers.patch | 43 +++++ ...from-linux-kernel.h-to-linux-const.h.patch | 147 ++++++++++++++++++ 3 files changed, 192 insertions(+) create mode 100644 queue-5.4/tools-headers-uapi-sync-linux-const.h-with-the-kernel-headers.patch create mode 100644 queue-5.4/uapi-move-constants-from-linux-kernel.h-to-linux-const.h.patch diff --git a/queue-5.4/series b/queue-5.4/series index 510b254a9d9..93bca981a18 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -16,3 +16,5 @@ powerpc-bitops-fix-possible-undefined-behaviour-with.patch jffs2-allow-setting-rp_size-to-zero-during-remountin.patch jffs2-fix-null-pointer-dereference-in-rp_size-fs-opt.patch scsi-block-fix-a-race-in-the-runtime-power-management-code.patch +uapi-move-constants-from-linux-kernel.h-to-linux-const.h.patch +tools-headers-uapi-sync-linux-const.h-with-the-kernel-headers.patch diff --git a/queue-5.4/tools-headers-uapi-sync-linux-const.h-with-the-kernel-headers.patch b/queue-5.4/tools-headers-uapi-sync-linux-const.h-with-the-kernel-headers.patch new file mode 100644 index 00000000000..3bf50eac5c7 --- /dev/null +++ b/queue-5.4/tools-headers-uapi-sync-linux-const.h-with-the-kernel-headers.patch @@ -0,0 +1,43 @@ +From 7ddcdea5b54492f54700f427f58690cf1e187e5e Mon Sep 17 00:00:00 2001 +From: Arnaldo Carvalho de Melo +Date: Thu, 17 Dec 2020 14:55:01 -0300 +Subject: tools headers UAPI: Sync linux/const.h with the kernel headers + +From: Arnaldo Carvalho de Melo + +commit 7ddcdea5b54492f54700f427f58690cf1e187e5e upstream. + +To pick up the changes in: + + a85cbe6159ffc973 ("uapi: move constants from to ") + +That causes no changes in tooling, just addresses this perf build +warning: + + Warning: Kernel ABI header at 'tools/include/uapi/linux/const.h' differs from latest version at 'include/uapi/linux/const.h' + diff -u tools/include/uapi/linux/const.h include/uapi/linux/const.h + +Cc: Adrian Hunter +Cc: Ian Rogers +Cc: Jiri Olsa +Cc: Namhyung Kim +Cc: Petr Vorel +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Greg Kroah-Hartman + +--- + tools/include/uapi/linux/const.h | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/tools/include/uapi/linux/const.h ++++ b/tools/include/uapi/linux/const.h +@@ -28,4 +28,9 @@ + #define _BITUL(x) (_UL(1) << (x)) + #define _BITULL(x) (_ULL(1) << (x)) + ++#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) ++#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) ++ ++#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) ++ + #endif /* _UAPI_LINUX_CONST_H */ diff --git a/queue-5.4/uapi-move-constants-from-linux-kernel.h-to-linux-const.h.patch b/queue-5.4/uapi-move-constants-from-linux-kernel.h-to-linux-const.h.patch new file mode 100644 index 00000000000..1bc9a9fc8c3 --- /dev/null +++ b/queue-5.4/uapi-move-constants-from-linux-kernel.h-to-linux-const.h.patch @@ -0,0 +1,147 @@ +From a85cbe6159ffc973e5702f70a3bd5185f8f3c38d Mon Sep 17 00:00:00 2001 +From: Petr Vorel +Date: Mon, 14 Dec 2020 19:03:21 -0800 +Subject: uapi: move constants from to + +From: Petr Vorel + +commit a85cbe6159ffc973e5702f70a3bd5185f8f3c38d upstream. + +and include in UAPI headers instead of . + +The reason is to avoid indirect include when using +some network headers: or others -> +-> . + +This indirect include causes on MUSL redefinition of struct sysinfo when +included both and some of UAPI headers: + + In file included from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:5, + from x86_64-buildroot-linux-musl/sysroot/usr/include/linux/netlink.h:5, + from ../include/tst_netlink.h:14, + from tst_crypto.c:13: + x86_64-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:8:8: error: redefinition of `struct sysinfo' + struct sysinfo { + ^~~~~~~ + In file included from ../include/tst_safe_macros.h:15, + from ../include/tst_test.h:93, + from tst_crypto.c:11: + x86_64-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here + +Link: https://lkml.kernel.org/r/20201015190013.8901-1-petr.vorel@gmail.com +Signed-off-by: Petr Vorel +Suggested-by: Rich Felker +Acked-by: Rich Felker +Cc: Peter Korsgaard +Cc: Baruch Siach +Cc: Florian Weimer +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + include/uapi/linux/const.h | 5 +++++ + include/uapi/linux/ethtool.h | 2 +- + include/uapi/linux/kernel.h | 9 +-------- + include/uapi/linux/lightnvm.h | 2 +- + include/uapi/linux/mroute6.h | 2 +- + include/uapi/linux/netfilter/x_tables.h | 2 +- + include/uapi/linux/netlink.h | 2 +- + include/uapi/linux/sysctl.h | 2 +- + 8 files changed, 12 insertions(+), 14 deletions(-) + +--- a/include/uapi/linux/const.h ++++ b/include/uapi/linux/const.h +@@ -28,4 +28,9 @@ + #define _BITUL(x) (_UL(1) << (x)) + #define _BITULL(x) (_ULL(1) << (x)) + ++#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) ++#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) ++ ++#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) ++ + #endif /* _UAPI_LINUX_CONST_H */ +--- a/include/uapi/linux/ethtool.h ++++ b/include/uapi/linux/ethtool.h +@@ -14,7 +14,7 @@ + #ifndef _UAPI_LINUX_ETHTOOL_H + #define _UAPI_LINUX_ETHTOOL_H + +-#include ++#include + #include + #include + +--- a/include/uapi/linux/kernel.h ++++ b/include/uapi/linux/kernel.h +@@ -3,13 +3,6 @@ + #define _UAPI_LINUX_KERNEL_H + + #include +- +-/* +- * 'kernel.h' contains some often-used function prototypes etc +- */ +-#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) +-#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) +- +-#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) ++#include + + #endif /* _UAPI_LINUX_KERNEL_H */ +--- a/include/uapi/linux/lightnvm.h ++++ b/include/uapi/linux/lightnvm.h +@@ -21,7 +21,7 @@ + #define _UAPI_LINUX_LIGHTNVM_H + + #ifdef __KERNEL__ +-#include ++#include + #include + #else /* __KERNEL__ */ + #include +--- a/include/uapi/linux/mroute6.h ++++ b/include/uapi/linux/mroute6.h +@@ -2,7 +2,7 @@ + #ifndef _UAPI__LINUX_MROUTE6_H + #define _UAPI__LINUX_MROUTE6_H + +-#include ++#include + #include + #include + #include /* For struct sockaddr_in6. */ +--- a/include/uapi/linux/netfilter/x_tables.h ++++ b/include/uapi/linux/netfilter/x_tables.h +@@ -1,7 +1,7 @@ + /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ + #ifndef _UAPI_X_TABLES_H + #define _UAPI_X_TABLES_H +-#include ++#include + #include + + #define XT_FUNCTION_MAXNAMELEN 30 +--- a/include/uapi/linux/netlink.h ++++ b/include/uapi/linux/netlink.h +@@ -2,7 +2,7 @@ + #ifndef _UAPI__LINUX_NETLINK_H + #define _UAPI__LINUX_NETLINK_H + +-#include ++#include + #include /* for __kernel_sa_family_t */ + #include + +--- a/include/uapi/linux/sysctl.h ++++ b/include/uapi/linux/sysctl.h +@@ -23,7 +23,7 @@ + #ifndef _UAPI_LINUX_SYSCTL_H + #define _UAPI_LINUX_SYSCTL_H + +-#include ++#include + #include + #include + -- 2.47.3