---

yaml --- r: 163736 b: refs/heads/master c: 54e2603 h: refs/heads/master v: v3
git-mirror · Sep 16, 2009 · 4c056dc · 4c056dc
1 parent 57ca148
commit 4c056dc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e11dadabf443dc3101f28b74d8b9d56870a87db4
+refs/heads/master: 54e2603f1a85b9725aa13518d69148b6e7061aa9
diff --git a/trunk/arch/x86/kernel/irqinit.c b/trunk/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/trunk/arch/x86/kernel/time.c b/trunk/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/trunk/arch/x86/kernel/x86_init.c b/trunk/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 change
@@ Expand Up / @@ -140,7 +140,7 @@ void __init init_ISA_irqs(void) @@
     	}
     }
-    void init_IRQ(void)
+    void __init init_IRQ(void)
     {
     	x86_init.irqs.intr_init();
     }
@@ Expand Down @@