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 | 39fa904443d5fef09dfeb90b94ec9892a5a96a35 (patch) | |
| tree | 68fc1b20736e178dc3625e00edb41bd5ccbddeaa | |
| parent | d225f006c08f2129a6a650bfc4fd6ee683968fa8 (diff) | |
| parent | 21fd461fa81a0a170f68b39fdea7efc1f5adc29e (diff) | |
| download | linux-crypto-39fa904443d5fef09dfeb90b94ec9892a5a96a35.tar.gz linux-crypto-39fa904443d5fef09dfeb90b94ec9892a5a96a35.zip | |
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'
| -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 3ec27c7e..f84f6b43 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"); |