diff --git a/[refs] b/[refs]
index ea691fa348b8..e1d7dc352a74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 761becff016b82a6a7a1b2ef224248da5f46bae9
+refs/heads/master: af7cf25dd15b74a78bff8ed5dc969b20dae9554d
diff --git a/trunk/crypto/xor.c b/trunk/crypto/xor.c
index 65c7b416b4a3..35d6b3adf230 100644
--- a/trunk/crypto/xor.c
+++ b/trunk/crypto/xor.c
@@ -56,11 +56,11 @@ xor_blocks(unsigned int src_count, unsigned int bytes, void *dest, void **srcs)
 EXPORT_SYMBOL(xor_blocks);
 
 /* Set of all registered templates.  */
-static struct xor_block_template *template_list;
+static struct xor_block_template *__initdata template_list;
 
 #define BENCH_SIZE (PAGE_SIZE)
 
-static void
+static void __init
 do_xor_speed(struct xor_block_template *tmpl, void *b1, void *b2)
 {
 	int speed;