diff --git a/[refs] b/[refs]
index 231ec09ebaf2..dd0fa2ec8690 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f0db7a2fb78895a197f64e548333b3bbd433996
+refs/heads/master: 8079ce34f2c3f5bfedcea8d4fb7290ce46ac5b56
diff --git a/trunk/arch/x86/kernel/sfi.c b/trunk/arch/x86/kernel/sfi.c
index 761df3f759c1..b294b7a0d4b9 100644
--- a/trunk/arch/x86/kernel/sfi.c
+++ b/trunk/arch/x86/kernel/sfi.c
@@ -55,16 +55,12 @@ void __init mp_sfi_register_lapic_address(unsigned long address)
 /* All CPUs enumerated by SFI must be present and enabled */
 void __cpuinit mp_sfi_register_lapic(u8 id)
 {
-	int boot_cpu = 0;
-
 	if (MAX_APICS - id <= 0) {
 		pr_warning("Processor #%d invalid (max %d)\n",
 			id, MAX_APICS);
 		return;
 	}
 
-	if (id == boot_cpu_physical_apicid)
-		boot_cpu = 1;
 	pr_info("registering lapic[%d]\n", id);
 
 	generic_processor_info(id, GET_APIC_VERSION(apic_read(APIC_LVR)));