Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 17f3609c21706b377ad80b5251558ed700c2af17

Authored by Andi Kleen
Committed by Linus Torvalds
1 parent 556f00ede8
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

include/linux/percpu.h
Diff comments   View file @ 17f3609
... ... @@ -107,7 +107,7 @@
107 107  
108 108 PCPU_FC_NR,
109 109 };
110   -extern const char *pcpu_fc_names[PCPU_FC_NR];
  110 +extern const char * const pcpu_fc_names[PCPU_FC_NR];
111 111  
112 112 extern enum pcpu_fc pcpu_chosen_fc;
113 113  
... ... @@ -1370,7 +1370,7 @@
1370 1370  
1371 1371 #ifdef CONFIG_SMP
1372 1372  
1373   -const char *pcpu_fc_names[PCPU_FC_NR] __initdata = {
  1373 +const char * const pcpu_fc_names[PCPU_FC_NR] __initconst = {
1374 1374 [PCPU_FC_AUTO] = "auto",
1375 1375 [PCPU_FC_EMBED] = "embed",
1376 1376 [PCPU_FC_PAGE] = "page",