summaryrefslogtreecommitdiff
path: root/mm/percpu.c
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-10-04 17:12:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-06 03:04:44 +0900
commit17f3609c21706b377ad80b5251558ed700c2af17 (patch)
treed4e41f77ec4fc92aaa86e552fd4e383dbf78c9f1 /mm/percpu.c
parent556f00ede819c20eaf2af9017a78c713b33ca4e7 (diff)
downloadlinux-3.10-17f3609c21706b377ad80b5251558ed700c2af17.tar.gz
linux-3.10-17f3609c21706b377ad80b5251558ed700c2af17.tar.bz2
linux-3.10-17f3609c21706b377ad80b5251558ed700c2af17.zip
sections: fix section conflicts in mm/percpu.c
Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/percpu.c')
-rw-r--r--mm/percpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/percpu.c b/mm/percpu.c
index bb4be7435ce..ddc5efb9c5b 100644
--- a/mm/percpu.c
+++ b/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",