diff --git a/[refs] b/[refs]
index 25c1a249602d..a5721e53661f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 376ec37667b510453f5a62fcd95d762786e6a0a9
+refs/heads/master: 1b6df6930994d5d027375b07ac9da63644eb5758
diff --git a/trunk/crypto/async_tx/raid6test.c b/trunk/crypto/async_tx/raid6test.c
index 98c83ca96c83..3ec27c7e62ea 100644
--- a/trunk/crypto/async_tx/raid6test.c
+++ b/trunk/crypto/async_tx/raid6test.c
@@ -28,6 +28,7 @@
 #define NDISKS 16 /* Including P and Q */
 
 static struct page *dataptrs[NDISKS];
+static addr_conv_t addr_conv[NDISKS];
 static struct page *data[NDISKS+3];
 static struct page *spare;
 static struct page *recovi;
@@ -69,7 +70,6 @@ static char disk_type(int d, int disks)
 static void raid6_dual_recov(int disks, size_t bytes, int faila, int failb, struct page **ptrs)
 {
 	struct async_submit_ctl submit;
-	addr_conv_t addr_conv[disks];
 	struct completion cmp;
 	struct dma_async_tx_descriptor *tx = NULL;
 	enum sum_check_flags result = ~0;
@@ -156,7 +156,6 @@ static int test_disks(int i, int j, int disks)
 
 static int test(int disks, int *tests)
 {
-	addr_conv_t addr_conv[disks];
 	struct dma_async_tx_descriptor *tx;
 	struct async_submit_ctl submit;
 	struct completion cmp;