diff --git a/[refs] b/[refs]
index c77903783776..4251b4d6465a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 556f00ede819c20eaf2af9017a78c713b33ca4e7
+refs/heads/master: 17f3609c21706b377ad80b5251558ed700c2af17
diff --git a/trunk/include/linux/percpu.h b/trunk/include/linux/percpu.h
index 2b9f82c037c9..cc88172c7d9a 100644
--- a/trunk/include/linux/percpu.h
+++ b/trunk/include/linux/percpu.h
@@ -107,7 +107,7 @@ enum pcpu_fc {
 
 	PCPU_FC_NR,
 };
-extern const char *pcpu_fc_names[PCPU_FC_NR];
+extern const char * const pcpu_fc_names[PCPU_FC_NR];
 
 extern enum pcpu_fc pcpu_chosen_fc;
 
diff --git a/trunk/mm/percpu.c b/trunk/mm/percpu.c
index bb4be7435ce3..ddc5efb9c5bb 100644
--- a/trunk/mm/percpu.c
+++ b/trunk/mm/percpu.c
@@ -1370,7 +1370,7 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
 
 #ifdef CONFIG_SMP
 
-const char *pcpu_fc_names[PCPU_FC_NR] __initdata = {
+const char * const pcpu_fc_names[PCPU_FC_NR] __initconst = {
 	[PCPU_FC_AUTO]	= "auto",
 	[PCPU_FC_EMBED]	= "embed",
 	[PCPU_FC_PAGE]	= "page",