From 1b734b4b0d1f39f66a724756db4507f3e1c54dbb Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Thu, 29 Oct 2009 16:41:49 +0000 Subject: [PATCH] --- yaml --- r: 208387 b: refs/heads/master c: e5d84970a554d5c0072043a7b9f0f5b88b5fdfe1 h: refs/heads/master i: 208385: 7ace1efeb735bf690161280abff4fbadb84c51d2 208383: 1622465fa44717400f58c49909e6e38008e03648 v: v3 --- [refs] | 2 +- trunk/crypto/async_tx/Kconfig | 14 ++++++++++++++ trunk/drivers/md/Kconfig | 13 ------------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 23aee1a88998..03aac7b3fb90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5e70d0fe3ea990cfb3fc8d7f76a719adcb1e0b5 +refs/heads/master: e5d84970a554d5c0072043a7b9f0f5b88b5fdfe1 diff --git a/trunk/crypto/async_tx/Kconfig b/trunk/crypto/async_tx/Kconfig index e5aeb2b79e6f..e24aa80087ad 100644 --- a/trunk/crypto/async_tx/Kconfig +++ b/trunk/crypto/async_tx/Kconfig @@ -22,4 +22,18 @@ config ASYNC_RAID6_RECOV tristate select ASYNC_CORE select ASYNC_PQ + select ASYNC_XOR + +config ASYNC_RAID6_TEST + tristate "Self test for hardware accelerated raid6 recovery" + depends on ASYNC_RAID6_RECOV + select ASYNC_MEMCPY + ---help--- + This is a one-shot self test that permutes through the + recovery of all the possible two disk failure scenarios for a + N-disk array. Recovery is performed with the asynchronous + raid6 recovery routines, and will optionally use an offload + engine if one is available. + + If unsure, say N. diff --git a/trunk/drivers/md/Kconfig b/trunk/drivers/md/Kconfig index 891f7c8490d3..e27ae4604cef 100644 --- a/trunk/drivers/md/Kconfig +++ b/trunk/drivers/md/Kconfig @@ -165,19 +165,6 @@ config MULTICORE_RAID456 If unsure, say N. -config ASYNC_RAID6_TEST - tristate "Self test for hardware accelerated raid6 recovery" - depends on RAID6_PQ - select ASYNC_RAID6_RECOV - ---help--- - This is a one-shot self test that permutes through the - recovery of all the possible two disk failure scenarios for a - N-disk array. Recovery is performed with the asynchronous - raid6 recovery routines, and will optionally use an offload - engine if one is available. - - If unsure, say N. - config MD_MULTIPATH tristate "Multipath I/O support" depends on BLK_DEV_MD