aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2008-08-29 08:15:04 -0400
committerIngo Molnar <mingo@elte.hu>2008-09-06 13:50:41 -0400
commit2d9cd6c27f00958a31622b8e9909d5e35f069b28 (patch)
tree6ff04d7eeec2ac5a2e45320684dfc203d5da5f92 /arch/x86/kernel/cpu
parente3224234717b4228c235cee401af89212f17a3a4 (diff)
x86-64: add two __cpuinit annotations
Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r--arch/x86/kernel/cpu/common.c2
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce_64.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index e8045c4ef1c1..5cde4b18448c 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -845,7 +845,7 @@ struct desc_ptr idt_descr = { 256 * 16 - 1, (unsigned long) idt_table };
845 845
846char boot_cpu_stack[IRQSTACKSIZE] __page_aligned_bss; 846char boot_cpu_stack[IRQSTACKSIZE] __page_aligned_bss;
847 847
848void pda_init(int cpu) 848void __cpuinit pda_init(int cpu)
849{ 849{
850 struct x8664_pda *pda = cpu_pda(cpu); 850 struct x8664_pda *pda = cpu_pda(cpu);
851 851
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c
index 726a5fcdf341..4b031a4ac856 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -860,7 +860,7 @@ error:
860 return err; 860 return err;
861} 861}
862 862
863static void mce_remove_device(unsigned int cpu) 863static __cpuinit void mce_remove_device(unsigned int cpu)
864{ 864{
865 int i; 865 int i;
866 866