diff --git a/[refs] b/[refs]
index 8b0ae7afb083..ca48e364603e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6a616800e68b61807d0f7bb0d5dc70665ef8046
+refs/heads/master: 839ad62e75ee1968438d1b72261304cd47fc961e
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 507c9fba03bb..1687b0167c4a 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -521,7 +521,7 @@ static void __init boot_cpu_init(void)
 	cpu_set(cpu, cpu_possible_map);
 }
 
-void __init __attribute__((weak)) smp_setup_processor_id(void)
+void __init __weak smp_setup_processor_id(void)
 {
 }