Merge keystone/android12-5.10-keystone-qcom-release.81+ (ecea9e1) into msm-5.10

* refs/heads/tmp-ecea9e1: UPSTREAM: rcu/exp: Mark current CPU as exp-QS in IPI loop second pass Change-Id: If3c93d3b67de64eea000561c698648d4ea6a0556 Signed-off-by: Sivasri Kumar, Vanka <quic_svanka@quicinc.com>
2022-02-22 13:56:47 +05:30
parent 086d12b7e0 ecea9e1e32
commit 2115ffedc6
2 changed files with 2 additions and 1 deletions
--- a/android/ACK_SHA
+++ b/android/ACK_SHA
@@ -1 +1 @@
-cb7e10d31bca4f247c34d6791d6db048edf7e7a8
+c3daae52afbc48a33c897a286e3c977e5d276535
--- a/kernel/rcu/tree_exp.h
+++ b/kernel/rcu/tree_exp.h
@@ -387,6 +387,7 @@ retry_ipi:
 			continue;
 		}
 		if (get_cpu() == cpu) {
+			mask_ofl_test |= mask;
 			put_cpu();
 			continue;
 		}