From: Sasha Levin Date: Sat, 20 Apr 2019 01:25:02 +0000 (-0400) Subject: remove unneeded perf patch from 4.9 X-Git-Tag: v4.9.170~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=420aaec65e8ece521d9cea60bb52e3de9b8328b9;p=thirdparty%2Fkernel%2Fstable-queue.git remove unneeded perf patch from 4.9 Signed-off-by: Sasha Levin --- diff --git a/queue-4.9/series b/queue-4.9/series index 45b9f07470d..0a70e15daeb 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -46,6 +46,5 @@ appletalk-fix-use-after-free-in-atalk_proc_exit.patch lib-div64.c-off-by-one-in-shift.patch include-linux-swap.h-use-offsetof-instead-of-custom-.patch tpm-tpm_crb-avoid-unaligned-reads-in-crb_recv.patch -tools-include-adopt-linux-bits.h.patch net-stmmac-set-dma-ring-length-before-enabling-the-dma.patch appletalk-fix-compile-regression.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 deleted file mode 100644 index 2c83835cfaa..00000000000 --- a/queue-4.9/tools-include-adopt-linux-bits.h.patch +++ /dev/null @@ -1,97 +0,0 @@ -From ba4aa02b417f08a0bee5e7b8ed70cac788a7c854 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 -Signed-off-by: Greg Kroah-Hartman - ---- - tools/include/linux/bitops.h | 6 ++---- - tools/include/linux/bits.h | 26 ++++++++++++++++++++++++++ - tools/perf/check-headers.sh | 1 + - 3 files changed, 29 insertions(+), 4 deletions(-) - ---- a/tools/include/linux/bitops.h -+++ b/tools/include/linux/bitops.h -@@ -3,7 +3,6 @@ - - #include - #include --#include - - #ifndef __WORDSIZE - #define __WORDSIZE (__SIZEOF_LONG__ * 8) -@@ -12,10 +11,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