aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/irqinit.c2
-rw-r--r--arch/x86/kernel/time.c2
-rw-r--r--arch/x86/kernel/x86_init.c4
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)
140 } 140 }
141} 141}
142 142
143void init_IRQ(void) 143void __init init_IRQ(void)
144{ 144{
145 x86_init.irqs.intr_init(); 145 x86_init.irqs.intr_init();
146} 146}
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)
105 setup_default_timer_irq(); 105 setup_default_timer_irq();
106} 106}
107 107
108static void x86_late_time_init(void) 108static __init void x86_late_time_init(void)
109{ 109{
110 x86_init.timers.timer_init(); 110 x86_init.timers.timer_init();
111 tsc_init(); 111 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) { }
23 * The platform setup functions are preset with the default functions 23 * The platform setup functions are preset with the default functions
24 * for standard PC hardware. 24 * for standard PC hardware.
25 */ 25 */
26struct __initdata x86_init_ops x86_init = { 26struct x86_init_ops x86_init __initdata = {
27 27
28 .resources = { 28 .resources = {
29 .probe_roms = x86_init_noop, 29 .probe_roms = x86_init_noop,
@@ -64,7 +64,7 @@ struct __initdata x86_init_ops x86_init = {
64 }, 64 },
65}; 65};
66 66
67__cpuinitdata struct x86_cpuinit_ops x86_cpuinit = { 67struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = {
68 .setup_percpu_clockev = setup_secondary_APIC_clock, 68 .setup_percpu_clockev = setup_secondary_APIC_clock,
69}; 69};
70 70