Commit 17f3609c authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

sections: fix section conflicts in mm/percpu.c 



Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 556f00ed

include/linux/percpu.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

mm/percpu.c

+1 −1
Original line number Diff line number Diff line
@@ -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",