From: Greg Kroah-Hartman Date: Tue, 28 May 2019 15:32:27 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v5.1.6~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ee4b87d439766a89c8c834f7c17803e794d9f8c;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: perf-tools-no-need-to-include-bitops.h-in-util.h.patch tools-include-adopt-linux-bits.h.patch --- diff --git a/queue-4.9/perf-tools-no-need-to-include-bitops.h-in-util.h.patch b/queue-4.9/perf-tools-no-need-to-include-bitops.h-in-util.h.patch new file mode 100644 index 00000000000..66b67145783 --- /dev/null +++ b/queue-4.9/perf-tools-no-need-to-include-bitops.h-in-util.h.patch @@ -0,0 +1,38 @@ +From e992641539e32d53ff4d99e4e00adab86e03c05a Mon Sep 17 00:00:00 2001 +From: Arnaldo Carvalho de Melo +Date: Tue, 18 Apr 2017 11:42:23 -0300 +Subject: perf tools: No need to include bitops.h in util.h + +From: Arnaldo Carvalho de Melo + +commit 6dcca6df4b73d409628c7b4464c63d4eb9d4d13a upstream. + +When we switched to the kernel's roundup_pow_of_two we forgot to remove +this include from util.h, do it now. + +Cc: Adrian Hunter +Cc: David Ahern +Cc: Jiri Olsa +Cc: Namhyung Kim +Cc: Wang Nan +Fixes: 91529834d1de ("perf evlist: Use roundup_pow_of_two") +Link: http://lkml.kernel.org/n/tip-kfye5rxivib6155cltx0bw4h@git.kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +[bwh: Backported to 4.9 as dependency of "tools include: Adopt linux/bits.h"; + adjusted context] +Signed-off-by: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman +--- + tools/perf/util/util.h | 1 - + 1 file changed, 1 deletion(-) + +--- a/tools/perf/util/util.h ++++ b/tools/perf/util/util.h +@@ -74,7 +74,6 @@ + #include + #include + #include +-#include + #include + #include "strlist.h" + diff --git a/queue-4.9/series b/queue-4.9/series index 79da6252dea..f3c579f0805 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -17,3 +17,5 @@ media-cpia2-fix-use-after-free-in-cpia2_exit.patch media-vivid-use-vfree-instead-of-kfree-for-dev-bitmap_cap.patch ssb-fix-possible-null-pointer-dereference-in-ssb_host_pcmcia_exit.patch at76c50x-usb-don-t-register-led_trigger-if-usb_register_driver-failed.patch +perf-tools-no-need-to-include-bitops.h-in-util.h.patch +tools-include-adopt-linux-bits.h.patch diff --git a/queue-4.9/tools-include-adopt-linux-bits.h.patch b/queue-4.9/tools-include-adopt-linux-bits.h.patch new file mode 100644 index 00000000000..caf1b0a9aba --- /dev/null +++ b/queue-4.9/tools-include-adopt-linux-bits.h.patch @@ -0,0 +1,101 @@ +From 9b5d783e9911dae542bef3e02b59e5205ce5ff01 Mon Sep 17 00:00:00 2001 +From: Arnaldo Carvalho de Melo +Date: Tue, 25 Sep 2018 10:55:59 -0300 +Subject: tools include: Adopt linux/bits.h + +From: Arnaldo Carvalho de Melo + +commit ba4aa02b417f08a0bee5e7b8ed70cac788a7c854 upstream. + +So that we reduce the difference of tools/include/linux/bitops.h to the +original kernel file, include/linux/bitops.h, trying to remove the need +to define BITS_PER_LONG, to avoid clashes with asm/bitsperlong.h. + +And the things removed from tools/include/linux/bitops.h are really in +linux/bits.h, so that we can have a copy and then +tools/perf/check_headers.sh will tell us when new stuff gets added to +linux/bits.h so that we can check if it is useful and if any adjustment +needs to be done to the tools/{include,arch}/ copies. + +Cc: Adrian Hunter +Cc: Alexander Sverdlin +Cc: David Ahern +Cc: Jiri Olsa +Cc: Namhyung Kim +Cc: Wang Nan +Link: https://lkml.kernel.org/n/tip-y1sqyydvfzo0bjjoj4zsl562@git.kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +[bwh: Backported to 4.9 as dependency of "x86/msr-index: Cleanup bit defines"; + adjusted context] +Signed-off-by: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman +--- + tools/include/linux/bitops.h | 7 ++----- + tools/include/linux/bits.h | 26 ++++++++++++++++++++++++++ + tools/perf/check-headers.sh | 1 + + 3 files changed, 29 insertions(+), 5 deletions(-) + create mode 100644 tools/include/linux/bits.h + +--- a/tools/include/linux/bitops.h ++++ b/tools/include/linux/bitops.h +@@ -3,8 +3,6 @@ + + #include + #include +-#include +- + #ifndef __WORDSIZE + #define __WORDSIZE (__SIZEOF_LONG__ * 8) + #endif +@@ -12,10 +10,9 @@ + #ifndef BITS_PER_LONG + # define BITS_PER_LONG __WORDSIZE + #endif ++#include ++#include + +-#define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG)) +-#define BIT_WORD(nr) ((nr) / BITS_PER_LONG) +-#define BITS_PER_BYTE 8 + #define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long)) + #define BITS_TO_U64(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(u64)) + #define BITS_TO_U32(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(u32)) +--- /dev/null ++++ b/tools/include/linux/bits.h +@@ -0,0 +1,26 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++#ifndef __LINUX_BITS_H ++#define __LINUX_BITS_H ++#include ++ ++#define BIT(nr) (1UL << (nr)) ++#define BIT_ULL(nr) (1ULL << (nr)) ++#define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG)) ++#define BIT_WORD(nr) ((nr) / BITS_PER_LONG) ++#define BIT_ULL_MASK(nr) (1ULL << ((nr) % BITS_PER_LONG_LONG)) ++#define BIT_ULL_WORD(nr) ((nr) / BITS_PER_LONG_LONG) ++#define BITS_PER_BYTE 8 ++ ++/* ++ * Create a contiguous bitmask starting at bit position @l and ending at ++ * position @h. For example ++ * GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000. ++ */ ++#define GENMASK(h, l) \ ++ (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) ++ ++#define GENMASK_ULL(h, l) \ ++ (((~0ULL) - (1ULL << (l)) + 1) & \ ++ (~0ULL >> (BITS_PER_LONG_LONG - 1 - (h)))) ++ ++#endif /* __LINUX_BITS_H */ +--- a/tools/perf/check-headers.sh ++++ b/tools/perf/check-headers.sh +@@ -4,6 +4,7 @@ HEADERS=' + include/uapi/linux/fcntl.h + include/uapi/linux/perf_event.h + include/uapi/linux/stat.h ++include/linux/bits.h + include/linux/hash.h + include/uapi/linux/hw_breakpoint.h + arch/x86/include/asm/disabled-features.h