4.9-stable patches

added patches:
	coresight-do-not-use-the-bit-macro-in-the-uapi-header.patch

diff --git a/queue-4.9/coresight-do-not-use-the-bit-macro-in-the-uapi-header.patch b/queue-4.9/coresight-do-not-use-the-bit-macro-in-the-uapi-header.patch
new file mode 100644 (file)
index 0000000..e0dea96
--- /dev/null
+++ b/queue-4.9/coresight-do-not-use-the-bit-macro-in-the-uapi-header.patch
@@ -0,0 +1,39 @@
+From 9b6eaaf3db5e5888df7bca7fed7752a90f7fd871 Mon Sep 17 00:00:00 2001
+From: Eugene Syromiatnikov <esyr@redhat.com>
+Date: Tue, 24 Mar 2020 05:22:13 +0100
+Subject: coresight: do not use the BIT() macro in the UAPI header
+
+From: Eugene Syromiatnikov <esyr@redhat.com>
+
+commit 9b6eaaf3db5e5888df7bca7fed7752a90f7fd871 upstream.
+
+The BIT() macro definition is not available for the UAPI headers
+(moreover, it can be defined differently in the user space); replace
+its usage with the _BITUL() macro that is defined in <linux/const.h>.
+
+Fixes: 237483aa5cf4 ("coresight: stm: adding driver for CoreSight STM component")
+Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
+Cc: stable <stable@vger.kernel.org>
+Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
+Link: https://lore.kernel.org/r/20200324042213.GA10452@asgard.redhat.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/uapi/linux/coresight-stm.h |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/include/uapi/linux/coresight-stm.h
++++ b/include/uapi/linux/coresight-stm.h
+@@ -1,8 +1,10 @@
+ #ifndef __UAPI_CORESIGHT_STM_H_
+ #define __UAPI_CORESIGHT_STM_H_
+ 
+-#define STM_FLAG_TIMESTAMPED   BIT(3)
+-#define STM_FLAG_GUARANTEED    BIT(7)
++#include <linux/const.h>
++
++#define STM_FLAG_TIMESTAMPED   _BITUL(3)
++#define STM_FLAG_GUARANTEED    _BITUL(7)
+ 
+ /*
+  * The CoreSight STM supports guaranteed and invariant timing

diff --git a/queue-4.9/series b/queue-4.9/series
index 932fa24848ad288b21b67d3d5d68e525025379e2..f8661a56d547acb091d79476aee32a7672db4769 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -8,3 +8,4 @@ sctp-fix-possibly-using-a-bad-saddr-with-a-given-dst.patch
 drm-etnaviv-replace-mmu-flush-marker-with-flush-sequence.patch
 blk-mq-sync-the-update-nr_hw_queues-with-blk_mq_queue_tag_busy_iter.patch
 blk-mq-allow-blocking-queue-tag-iter-callbacks.patch
+coresight-do-not-use-the-bit-macro-in-the-uapi-header.patch