On Mon, 11 Mar 2013 11:27:44 +0100 Paul Bolle <[email protected]> wrote:
> > Following will be in -next shortly. > > > > NeilBrown > > > > > > From 51acbcec6c42b24482bac18e42befc822524535d Mon Sep 17 00:00:00 2001 > > From: NeilBrown <[email protected]> > > Date: Thu, 28 Feb 2013 09:08:34 +1100 > > Subject: [PATCH] md: remove CONFIG_MULTICORE_RAID456 > > > > This doesn't seem to actually help and we have an alternate > > multi-threading approach waiting in the wings, so just get > > rid of this config option and associated code. > > > > As a bonus, we remove one use of CONFIG_EXPERIMENTAL > > > > Cc: Dan Williams <[email protected]> > > Cc: Kees Cook <[email protected]> > > Signed-off-by: NeilBrown <[email protected]> > > That commit entered mainline in v3.9-rc2 (still as commit > 51acbcec6c42b24482bac18e42befc822524535d). It missed one instance of > CONFIG_MULTICORE_RAID456, so this additional patch is needed (which also > cleans that macro from two defconfig files). Compile tested, by the way. > > > Paul Bolle Thanks Paul. I'll send this off to Linus some time in the next week or so. Thanks, NeilBrown > > >From ab10e19eeca5ae271ae965418ff736db0230aab6 Mon Sep 17 00:00:00 2001 > From: Paul Bolle <[email protected]> > Date: Mon, 11 Mar 2013 11:16:25 +0100 > Subject: [PATCH] md: remove CONFIG_MULTICORE_RAID456 entirely > > Once instance of this Kconfig macro remained after commit > 51acbcec6c42b24482bac18e42befc822524535d ("md: remove > CONFIG_MULTICORE_RAID456"). Remove that one too. And, while we're at it, > also remove it from the defconfig files that carry it. > > Signed-off-by: Paul Bolle <[email protected]> > --- > arch/tile/configs/tilegx_defconfig | 1 - > arch/tile/configs/tilepro_defconfig | 1 - > drivers/md/raid5.h | 4 ---- > 3 files changed, 6 deletions(-) > > diff --git a/arch/tile/configs/tilegx_defconfig > b/arch/tile/configs/tilegx_defconfig > index 8c5eff6..4768481 100644 > --- a/arch/tile/configs/tilegx_defconfig > +++ b/arch/tile/configs/tilegx_defconfig > @@ -330,7 +330,6 @@ CONFIG_MD_RAID0=m > CONFIG_MD_RAID1=m > CONFIG_MD_RAID10=m > CONFIG_MD_RAID456=m > -CONFIG_MULTICORE_RAID456=y > CONFIG_MD_FAULTY=m > CONFIG_BLK_DEV_DM=m > CONFIG_DM_DEBUG=y > diff --git a/arch/tile/configs/tilepro_defconfig > b/arch/tile/configs/tilepro_defconfig > index e7a3dfc..dd2b8f0 100644 > --- a/arch/tile/configs/tilepro_defconfig > +++ b/arch/tile/configs/tilepro_defconfig > @@ -324,7 +324,6 @@ CONFIG_MD_RAID0=m > CONFIG_MD_RAID1=m > CONFIG_MD_RAID10=m > CONFIG_MD_RAID456=m > -CONFIG_MULTICORE_RAID456=y > CONFIG_MD_FAULTY=m > CONFIG_BLK_DEV_DM=m > CONFIG_DM_DEBUG=y > diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h > index 18b2c4a..31e2ec1 100644 > --- a/drivers/md/raid5.h > +++ b/drivers/md/raid5.h > @@ -221,10 +221,6 @@ struct stripe_head { > struct stripe_operations { > int target, target2; > enum sum_check_flags zero_sum_result; > - #ifdef CONFIG_MULTICORE_RAID456 > - unsigned long request; > - wait_queue_head_t wait_for_ops; > - #endif > } ops; > struct r5dev { > /* rreq and rvec are used for the replacement device when
signature.asc
Description: PGP signature
