From e05ea7f913b2cfade81e133088bc34d911e4ed30 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 6 Apr 2020 21:01:26 +0200 Subject: [PATCH] 4.9-stable patches added patches: coresight-do-not-use-the-bit-macro-in-the-uapi-header.patch --- ...use-the-bit-macro-in-the-uapi-header.patch | 39 +++++++++++++++++++ queue-4.9/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 queue-4.9/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 index 00000000000..e0dea96d965 --- /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 +Date: Tue, 24 Mar 2020 05:22:13 +0100 +Subject: coresight: do not use the BIT() macro in the UAPI header + +From: Eugene Syromiatnikov + +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 . + +Fixes: 237483aa5cf4 ("coresight: stm: adding driver for CoreSight STM component") +Signed-off-by: Eugene Syromiatnikov +Cc: stable +Reviewed-by: Mathieu Poirier +Link: https://lore.kernel.org/r/20200324042213.GA10452@asgard.redhat.com +Signed-off-by: Greg Kroah-Hartman + +--- + 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 ++ ++#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 932fa24848a..f8661a56d54 100644 --- 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 -- 2.47.3