From 2f9d0b7884cd8d39748762c1e1b4061c48daf471 Mon Sep 17 00:00:00 2001
From: Jack Steiner <steiner@sgi.com>
Date: Thu, 31 Aug 2006 11:35:57 -0500
Subject: [PATCH] --- yaml --- r: 33819 b: refs/heads/master c:
 38f5745c5a90641079fd5b48600ae63f7ab6edcd h: refs/heads/master i:   33817:
 7db23846cc0ad2693b2ffb5982c1755f0a0bf8f4   33815:
 97373fc1046b56bac8812986518b7aae3ed78093 v: v3

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

diff --git a/[refs] b/[refs]
index 58d33dc688c6..5bf7e135de78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c7d67073e2d196597f541351bc9b109c8a93528
+refs/heads/master: 38f5745c5a90641079fd5b48600ae63f7ab6edcd
diff --git a/trunk/arch/ia64/sn/kernel/setup.c b/trunk/arch/ia64/sn/kernel/setup.c
index c119e8b620de..5f2dcba7fa8d 100644
--- a/trunk/arch/ia64/sn/kernel/setup.c
+++ b/trunk/arch/ia64/sn/kernel/setup.c
@@ -565,7 +565,7 @@ static void __init sn_init_pdas(char **cmdline_p)
  * Also sets up a few fields in the nodepda.  Also known as
  * platform_cpu_init() by the ia64 machvec code.
  */
-void __init sn_cpu_init(void)
+void __cpuinit sn_cpu_init(void)
 {
 	int cpuid;
 	int cpuphyid;