diff --git a/[refs] b/[refs]
index 2b62b245fc74..0a20f7322d68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68bbc172cd1b0ee01814304b8a7bef8922d5fdca
+refs/heads/master: ed77504b2007ff7ce56841227467ac3ead52df62
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
index 4be29832e3dc..e328e3eb8cbe 100644
--- a/trunk/arch/x86_64/kernel/setup.c
+++ b/trunk/arch/x86_64/kernel/setup.c
@@ -672,7 +672,7 @@ static void __init amd_detect_cmp(struct cpuinfo_x86 *c)
 #endif
 }
 
-static void __init init_amd(struct cpuinfo_x86 *c)
+static void __cpuinit init_amd(struct cpuinfo_x86 *c)
 {
 	unsigned level;