aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-02-19 19:03:53 -0500
committerMichal Marek <mmarek@suse.cz>2010-03-03 05:26:01 -0500
commitc273fb3b5d0490d3058f6cce77a92860671ee7b6 (patch)
treebbd83d870833c8389fce42b9e5eadf3a25c7c3ee
parent07b3bb1ef211fdf20eddcae902d1098788ea2f6e (diff)
Rename .data.init to .data..init.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--arch/sparc/boot/btfixupprep.c2
-rw-r--r--arch/x86/kernel/setup_percpu.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/boot/btfixupprep.c b/arch/sparc/boot/btfixupprep.c
index bbf91b9c3d39..e7f2940bd270 100644
--- a/arch/sparc/boot/btfixupprep.c
+++ b/arch/sparc/boot/btfixupprep.c
@@ -325,7 +325,7 @@ main1:
325 (*rr)->next = NULL; 325 (*rr)->next = NULL;
326 } 326 }
327 printf("! Generated by btfixupprep. Do not edit.\n\n"); 327 printf("! Generated by btfixupprep. Do not edit.\n\n");
328 printf("\t.section\t\".data.init\",#alloc,#write\n\t.align\t4\n\n"); 328 printf("\t.section\t\".data..init\",#alloc,#write\n\t.align\t4\n\n");
329 printf("\t.global\t___btfixup_start\n___btfixup_start:\n\n"); 329 printf("\t.global\t___btfixup_start\n___btfixup_start:\n\n");
330 for (i = 0; i < last; i++) { 330 for (i = 0; i < last; i++) {
331 f = array + i; 331 f = array + i;
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index 35abcb8b00e9..8c9f68ec97ab 100644
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -241,7 +241,7 @@ void __init setup_per_cpu_areas(void)
241#endif 241#endif
242#endif 242#endif
243 /* 243 /*
244 * Up to this point, the boot CPU has been using .data.init 244 * Up to this point, the boot CPU has been using .init.data
245 * area. Reload any changed state for the boot CPU. 245 * area. Reload any changed state for the boot CPU.
246 */ 246 */
247 if (cpu == boot_cpu_id) 247 if (cpu == boot_cpu_id)