From b0950ce1e217b92406ffc183a6d02306d4e09053 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 3 Jul 2025 16:38:51 +0200 Subject: [PATCH] fix up queue-6.1/coresight-only-check-bottom-two-claim-bits.patch --- ...ght-only-check-bottom-two-claim-bits.patch | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/queue-6.1/coresight-only-check-bottom-two-claim-bits.patch b/queue-6.1/coresight-only-check-bottom-two-claim-bits.patch index 597c332b55..09edcd89ea 100644 --- a/queue-6.1/coresight-only-check-bottom-two-claim-bits.patch +++ b/queue-6.1/coresight-only-check-bottom-two-claim-bits.patch @@ -20,15 +20,13 @@ Signed-off-by: Suzuki K Poulose Link: https://lore.kernel.org/r/20250325-james-coresight-claim-tags-v4-2-dfbd3822b2e5@linaro.org Signed-off-by: Sasha Levin --- - drivers/hwtracing/coresight/coresight-core.c | 3 ++- - drivers/hwtracing/coresight/coresight-priv.h | 1 + - 2 files changed, 3 insertions(+), 1 deletion(-) + drivers/hwtracing/coresight/coresight-core.c | 3 ++- + drivers/hwtracing/coresight/coresight-priv.h | 2 ++ + 2 files changed, 4 insertions(+), 1 deletion(-) -diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c -index 4477b1ab73577..6d836f10b3de6 100644 --- a/drivers/hwtracing/coresight/coresight-core.c +++ b/drivers/hwtracing/coresight/coresight-core.c -@@ -189,7 +189,8 @@ static int coresight_find_link_outport(struct coresight_device *csdev, +@@ -189,7 +189,8 @@ static int coresight_find_link_outport(s static inline u32 coresight_read_claim_tags(struct coresight_device *csdev) { @@ -38,11 +36,17 @@ index 4477b1ab73577..6d836f10b3de6 100644 } static inline bool coresight_is_claimed_self_hosted(struct coresight_device *csdev) -diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h -index 595ce58620567..3c78df0b60893 100644 --- a/drivers/hwtracing/coresight/coresight-priv.h +++ b/drivers/hwtracing/coresight/coresight-priv.h -@@ -32,6 +32,7 @@ +@@ -8,6 +8,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -32,6 +33,7 @@ * Coresight device CLAIM protocol. * See PSCI - ARM DEN 0022D, Section: 6.8.1 Debug and Trace save and restore. */ @@ -50,6 +54,3 @@ index 595ce58620567..3c78df0b60893 100644 #define CORESIGHT_CLAIM_SELF_HOSTED BIT(1) #define TIMEOUT_US 100 --- -2.39.5 - -- 2.39.5