---

yaml --- r: 70942 b: refs/heads/master c: 8957eca h: refs/heads/master v: v3
git-mirror · Oct 17, 2007 · 032bd7d · 032bd7d
1 parent 742a09b
commit 032bd7d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afc54659b1023a5232a55b7b8919294c693ff8ab
+refs/heads/master: 8957ecab029669f43512e53521e8b59ec6b07bdd
diff --git a/trunk/arch/x86/kernel/smpboot_32.c b/trunk/arch/x86/kernel/smpboot_32.c
@@ -118,7 +118,7 @@ DEFINE_PER_CPU(int, cpu_state) = { 0 };
  * has made sure it's suitably aligned.
  */
 
-static unsigned long __devinit setup_trampoline(void)
+static unsigned long __cpuinit setup_trampoline(void)
 {
 	memcpy(trampoline_base, trampoline_data, trampoline_end - trampoline_data);
 	return virt_to_phys(trampoline_base);