---

yaml --- r: 112832 b: refs/heads/master c: 2d9cd6c h: refs/heads/master v: v3
git-mirror · Sep 6, 2008 · afb7c30 · afb7c30
1 parent 903181d
commit afb7c30
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3224234717b4228c235cee401af89212f17a3a4
+refs/heads/master: 2d9cd6c27f00958a31622b8e9909d5e35f069b28
diff --git a/trunk/arch/x86/kernel/cpu/common.c b/trunk/arch/x86/kernel/cpu/common.c
@@ -845,7 +845,7 @@ struct desc_ptr idt_descr = { 256 * 16 - 1, (unsigned long) idt_table };
 
 char boot_cpu_stack[IRQSTACKSIZE] __page_aligned_bss;
 
-void pda_init(int cpu)
+void __cpuinit pda_init(int cpu)
 {
 	struct x8664_pda *pda = cpu_pda(cpu);
 

diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c b/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -860,7 +860,7 @@ static __cpuinit int mce_create_device(unsigned int cpu)
 	return err;
 }
 
-static void mce_remove_device(unsigned int cpu)
+static __cpuinit void mce_remove_device(unsigned int cpu)
 {
 	int i;
-Original file line number
+Diff line change
@@ Expand Up / @@ -860,7 +860,7 @@ static __cpuinit int mce_create_device(unsigned int cpu) @@
     	return err;
     }
-    static void mce_remove_device(unsigned int cpu)
+    static __cpuinit void mce_remove_device(unsigned int cpu)
     {
     	int i;
@@ Expand Down @@