diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-30 13:46:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-30 13:46:29 -0800 |
| commit | 05a625486efc3209ae4d98e253dafa6ce0124385 (patch) | |
| tree | b78b4a854639fecc91598ecb05900c929a6ab85e /crypto | |
| parent | 1f11abc966b82b9fd0c834707486ef301b2f398d (diff) | |
| parent | f80ca163d65903276bec7045a484a79c0897eb2d (diff) | |
| download | linux-05a625486efc3209ae4d98e253dafa6ce0124385.tar.bz2 | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
drivers/dma: Correct use after free
drivers/dma: drop unnecesary memset
ioat2,3: put channel hardware in known state at init
async_tx: expand async raid6 test to cover ioatdma corner case
ioat3: fix p-disabled q-continuation
sh: fix DMA driver's descriptor chaining and cookie assignment
dma: at_hdmac: correct incompatible type for argument 1 of 'spin_lock_bh'
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/async_tx/raid6test.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/async_tx/raid6test.c b/crypto/async_tx/raid6test.c index 3ec27c7e62ea..f84f6b4301d9 100644 --- a/crypto/async_tx/raid6test.c +++ b/crypto/async_tx/raid6test.c @@ -214,6 +214,13 @@ static int raid6_test(void) err += test(4, &tests); if (NDISKS > 5) err += test(5, &tests); + /* the 11 and 12 disk cases are special for ioatdma (p-disabled + * q-continuation without extended descriptor) + */ + if (NDISKS > 12) { + err += test(11, &tests); + err += test(12, &tests); + } err += test(NDISKS, &tests); pr("\n"); |