From d0849f75110b0229d298752b95c8e45a3828372e Mon Sep 17 00:00:00 2001
From: Helge Deller <deller@gmx.de>
Date: Mon, 28 May 2007 00:26:02 +0200
Subject: [PATCH] --- yaml --- r: 57756 b: refs/heads/master c:
 8dff980f1d1392990c6813c86f4bce108d3054fe h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/parisc/kernel/smp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 743b0e0f1b9a..9ab90b7d2dba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2b6ebd50be76879261b67fc5fd29608b82ae443
+refs/heads/master: 8dff980f1d1392990c6813c86f4bce108d3054fe
diff --git a/trunk/arch/parisc/kernel/smp.c b/trunk/arch/parisc/kernel/smp.c
index 4bf7cd19cc46..04c7e1d36cea 100644
--- a/trunk/arch/parisc/kernel/smp.c
+++ b/trunk/arch/parisc/kernel/smp.c
@@ -461,7 +461,7 @@ void __init smp_callin(void)
 /*
  * Bring one cpu online.
  */
-int __init smp_boot_one_cpu(int cpuid)
+int __cpuinit smp_boot_one_cpu(int cpuid)
 {
 	struct task_struct *idle;
 	long timeout;