diff --git a/[refs] b/[refs]
index f78931a7e433..31d6bc1a9dcc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17a801f4bfeb8d55df1b05fa7adb16ada504e765
+refs/heads/master: 26d7b99b835294ab21e2a2b4b3bdf04b03b0028d
diff --git a/trunk/lib/test-kstrtox.c b/trunk/lib/test-kstrtox.c
index d55769d63cb8..bea3f3fa3f02 100644
--- a/trunk/lib/test-kstrtox.c
+++ b/trunk/lib/test-kstrtox.c
@@ -11,7 +11,7 @@ struct test_fail {
 };
 
 #define DEFINE_TEST_FAIL(test)	\
-	const struct test_fail test[] __initdata
+	const struct test_fail test[] __initconst
 
 #define DECLARE_TEST_OK(type, test_type)	\
 	test_type {				\
@@ -21,7 +21,7 @@ struct test_fail {
 	}
 
 #define DEFINE_TEST_OK(type, test)	\
-	const type test[] __initdata
+	const type test[] __initconst
 
 #define TEST_FAIL(fn, type, fmt, test)					\
 {									\