From 54e2603f1a85b9725aa13518d69148b6e7061aa9 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 16 Sep 2009 08:42:26 +0200 Subject: [PATCH] x86: platform: Fix section annotations 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 --- arch/x86/kernel/irqinit.c | 2 +- arch/x86/kernel/time.c | 2 +- arch/x86/kernel/x86_init.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c index e0142cda2394..73b16649b7d1 100644 --- 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 index fcece00356a4..e293ac56c723 100644 --- 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 index 24be7f397894..68824c7be4e2 100644 --- 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, }; -- 2.20.1