x86: platform: Fix section annotations

KAGA-KOKO · KAGA-KOKO · commit 54e2603f1a85 · 2009-09-16T10:21:10.000+02:00
init_IRQ() and x86_late_time_init() are missing __init annotations.

The x86 platform ops variables are annotated, but the annotation needs
to be put between the variable name and the "=" of the initializer.

Signed-off-by: Thomas Gleixner &lt;tglx@linutronix.de&gt;
diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c
@@ -140,7 +140,7 @@ void __init init_ISA_irqs(void)
 	}
 }
 
-void init_IRQ(void)
+void __init init_IRQ(void)
 {
 	x86_init.irqs.intr_init();
 }
diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
@@ -105,7 +105,7 @@ void __init hpet_time_init(void)
 	setup_default_timer_irq();
 }
 
-static void x86_late_time_init(void)
+static __init void x86_late_time_init(void)
 {
 	x86_init.timers.timer_init();
 	tsc_init();
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
@@ -23,7 +23,7 @@ void __init x86_init_pgd_noop(pgd_t *unused) { }
  * The platform setup functions are preset with the default functions
  * for standard PC hardware.
  */
-struct __initdata x86_init_ops x86_init = {
+struct x86_init_ops x86_init __initdata = {
 
 	.resources = {
 		.probe_roms		= x86_init_noop,
@@ -64,7 +64,7 @@ struct __initdata x86_init_ops x86_init = {
 	},
 };
 
-__cpuinitdata struct x86_cpuinit_ops x86_cpuinit = {
+struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = {
 	.setup_percpu_clockev		= setup_secondary_APIC_clock,
 };
 

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ void __init init_ISA_irqs(void)`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
`143`		`-void init_IRQ(void)`
	`143`	`+void __init init_IRQ(void)`
`144`	`144`	`{`
`145`	`145`	`x86_init.irqs.intr_init();`
`146`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ void __init hpet_time_init(void)`
`105`	`105`	`setup_default_timer_irq();`
`106`	`106`	`}`
`107`	`107`
`108`		`-static void x86_late_time_init(void)`
	`108`	`+static __init void x86_late_time_init(void)`
`109`	`109`	`{`
`110`	`110`	`x86_init.timers.timer_init();`
`111`	`111`	`tsc_init();`