From 908bca50789c28ff46ead0d85e637e093e4862bf Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Sun, 11 Nov 2007 21:06:45 -0800 Subject: [PATCH] --- yaml --- r: 73891 b: refs/heads/master c: 8f8182106890970bb13bed325f0a04aef931883d h: refs/heads/master i: 73889: 4c996d4a935e5d20b580ceb01a91b19deed41100 73887: 57a792886e7fd42ca2d045e17ddfe532047b3d66 v: v3 --- [refs] | 2 +- trunk/arch/x86/mach-voyager/voyager_smp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ced8b44c00e2..a1d51e8f9781 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5ef67ef0b5d96315d3f7b74823cbfa85938a3a8 +refs/heads/master: 8f8182106890970bb13bed325f0a04aef931883d diff --git a/trunk/arch/x86/mach-voyager/voyager_smp.c b/trunk/arch/x86/mach-voyager/voyager_smp.c index 69371434b0cf..88124dd35406 100644 --- a/trunk/arch/x86/mach-voyager/voyager_smp.c +++ b/trunk/arch/x86/mach-voyager/voyager_smp.c @@ -1900,7 +1900,7 @@ voyager_smp_prepare_cpus(unsigned int max_cpus) smp_boot_cpus(); } -static void __devinit voyager_smp_prepare_boot_cpu(void) +static void __cpuinit voyager_smp_prepare_boot_cpu(void) { init_gdt(smp_processor_id()); switch_to_new_gdt(); @@ -1911,7 +1911,7 @@ static void __devinit voyager_smp_prepare_boot_cpu(void) cpu_set(smp_processor_id(), cpu_present_map); } -static int __devinit +static int __cpuinit voyager_cpu_up(unsigned int cpu) { /* This only works at boot for x86. See "rewrite" above. */