From ed26b5ddf3231e0637d908f0640cba7c59abc9b9 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Wed, 30 Jan 2008 13:33:37 +0100
Subject: [PATCH] --- yaml --- r: 80408 b: refs/heads/master c:
 adb8daed46356d1772e8bd8def1b70c8cb58ce12 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f98251a90a6b..422bcfb437dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3eaf5efae72b33bc6132e9590e5d4bf11532f8c4
+refs/heads/master: adb8daed46356d1772e8bd8def1b70c8cb58ce12
diff --git a/trunk/arch/x86/kernel/setup_64.c b/trunk/arch/x86/kernel/setup_64.c
index 9ee2bc30d530..c9b7f44ea497 100644
--- a/trunk/arch/x86/kernel/setup_64.c
+++ b/trunk/arch/x86/kernel/setup_64.c
@@ -530,7 +530,7 @@ static int nearby_node(int apicid)
  * On a AMD dual core setup the lower bits of the APIC id distingush the cores.
  * Assumes number of cores is a power of two.
  */
-static void __init amd_detect_cmp(struct cpuinfo_x86 *c)
+static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c)
 {
 #ifdef CONFIG_SMP
 	unsigned bits;