diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-12-25 13:38:11 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-12-25 13:38:53 -0500 |
| commit | e9bb7fa24407c8b983510dfc8a1dfc9dcd37c814 (patch) | |
| tree | ddb40db92c472607b5a8dfb9f100b552766781db | |
| parent | 7edf5bac7d57a8440e7df5510b2ae4f827bf5b87 (diff) | |
| download | 4.9-rt-patches-e9bb7fa24407c8b983510dfc8a1dfc9dcd37c814.tar.gz | |
raid5: import refreshed patch with cpu_hp awarenessrt-v4.8-918-g597f03f9d133
| -rw-r--r-- | patches/md-raid5-percpu-handling-rt-aware.patch | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/patches/md-raid5-percpu-handling-rt-aware.patch b/patches/md-raid5-percpu-handling-rt-aware.patch index 35b9d2b73e652..2593aa1b70123 100644 --- a/patches/md-raid5-percpu-handling-rt-aware.patch +++ b/patches/md-raid5-percpu-handling-rt-aware.patch @@ -14,9 +14,9 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Tested-by: Udo van den Heuvel <udovdh@xs4all.nl> --- - drivers/md/raid5.c | 7 +++++-- + drivers/md/raid5.c | 8 +++++--- drivers/md/raid5.h | 1 + - 2 files changed, 6 insertions(+), 2 deletions(-) + 2 files changed, 6 insertions(+), 3 deletions(-) --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -41,14 +41,22 @@ Tested-by: Udo van den Heuvel <udovdh@xs4all.nl> } static struct stripe_head *alloc_stripe(struct kmem_cache *sc, gfp_t gfp, -@@ -6438,6 +6440,7 @@ static int raid5_alloc_percpu(struct r5c - __func__, cpu); - break; - } -+ spin_lock_init(&per_cpu_ptr(conf->percpu, cpu)->lock); +@@ -6391,6 +6393,7 @@ static int raid456_cpu_up_prepare(unsign + __func__, cpu); + return -ENOMEM; } - put_online_cpus(); ++ spin_lock_init(&per_cpu_ptr(conf->percpu, cpu)->lock); + return 0; + } +@@ -6401,7 +6404,6 @@ static int raid5_alloc_percpu(struct r5c + conf->percpu = alloc_percpu(struct raid5_percpu); + if (!conf->percpu) + return -ENOMEM; +- + err = cpuhp_state_add_instance(CPUHP_MD_RAID5_PREPARE, &conf->node); + if (!err) { + conf->scribble_disks = max(conf->raid_disks, --- a/drivers/md/raid5.h +++ b/drivers/md/raid5.h @@ -504,6 +504,7 @@ struct r5conf { |