diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 19:53:03 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 19:53:37 -0400 |
| commit | f0ae5c3d172ea46bc0580e87e6410537fe244fce (patch) | |
| tree | 39eda8f455d2aa32ee7782105c68de8492eec50d | |
| parent | a691f60771ea760a182ddb8536f093072c731e33 (diff) | |
| download | longterm-queue-4.18-f0ae5c3d172ea46bc0580e87e6410537fe244fce.tar.gz | |
rcuperf: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/rcuperf-Fix-cleanup-path-for-invalid-perf_type-strin.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/queue/rcuperf-Fix-cleanup-path-for-invalid-perf_type-strin.patch b/queue/rcuperf-Fix-cleanup-path-for-invalid-perf_type-strin.patch index c82fc01..9b0cd93 100644 --- a/queue/rcuperf-Fix-cleanup-path-for-invalid-perf_type-strin.patch +++ b/queue/rcuperf-Fix-cleanup-path-for-invalid-perf_type-strin.patch @@ -1,4 +1,4 @@ -From ad092c027713a68a34168942a5ef422e42e039f4 Mon Sep 17 00:00:00 2001 +From dbd28ebc4a819ab9eacc96c30b40adb2d60333ed Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" <paulmck@linux.ibm.com> Date: Thu, 21 Mar 2019 10:26:41 -0700 Subject: [PATCH] rcuperf: Fix cleanup path for invalid perf_type strings @@ -21,10 +21,10 @@ relying on an irrelevant cur_ops value. Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com> diff --git a/kernel/rcu/rcuperf.c b/kernel/rcu/rcuperf.c -index c29761152874..7a6890b23c5f 100644 +index e232846516b3..3d2a93f16bcd 100644 --- a/kernel/rcu/rcuperf.c +++ b/kernel/rcu/rcuperf.c -@@ -494,6 +494,10 @@ rcu_perf_cleanup(void) +@@ -557,6 +557,10 @@ rcu_perf_cleanup(void) if (torture_cleanup_begin()) return; @@ -35,9 +35,9 @@ index c29761152874..7a6890b23c5f 100644 if (reader_tasks) { for (i = 0; i < nrealreaders; i++) -@@ -614,6 +618,7 @@ rcu_perf_init(void) - pr_cont("\n"); - WARN_ON(!IS_MODULE(CONFIG_RCU_PERF_TEST)); +@@ -678,6 +682,7 @@ rcu_perf_init(void) + pr_alert(" %s", perf_ops[i]->name); + pr_alert("\n"); firsterr = -EINVAL; + cur_ops = NULL; goto unwind; |