diff --git a/[refs] b/[refs]
index 5e4f1a1257b1..43e0e54f62ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c393e7b95bceafcefd5357afdda9f5047b6aa69
+refs/heads/master: 0f4fdb7fba0b3ec66df39d0e743e701404161fb8
diff --git a/trunk/arch/x86_64/kernel/genapic_flat.c b/trunk/arch/x86_64/kernel/genapic_flat.c
index 1a2ab825be98..c66ca7b1d31a 100644
--- a/trunk/arch/x86_64/kernel/genapic_flat.c
+++ b/trunk/arch/x86_64/kernel/genapic_flat.c
@@ -108,10 +108,7 @@ static unsigned int flat_cpu_mask_to_apicid(cpumask_t cpumask)
 
 static unsigned int phys_pkg_id(int index_msb)
 {
-	u32 ebx;
-
-	ebx = cpuid_ebx(1);
-	return ((ebx >> 24) & 0xFF) >> index_msb;
+	return hard_smp_processor_id() >> index_msb;
 }
 
 struct genapic apic_flat =  {