diff --git a/[refs] b/[refs]
index 97d5f3a15445..0d7604960d73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fa7c794fe4dc127f7fac3fad4d13628e68f89ce
+refs/heads/master: b7f5e3c7742d5332b78b831131f43fc3630e6322
diff --git a/trunk/arch/x86_64/kernel/apic.c b/trunk/arch/x86_64/kernel/apic.c
index b95d1e378b96..6472e321cad7 100644
--- a/trunk/arch/x86_64/kernel/apic.c
+++ b/trunk/arch/x86_64/kernel/apic.c
@@ -38,6 +38,7 @@
 #include <asm/timex.h>
 #include <asm/apic.h>
 
+int apic_mapped;
 int apic_verbosity;
 int apic_runs_main_timer;
 int apic_calibrate_pmtmr __initdata;
@@ -600,6 +601,7 @@ void __init init_apic_mappings(void)
 		apic_phys = mp_lapic_addr;
 
 	set_fixmap_nocache(FIX_APIC_BASE, apic_phys);
+	apic_mapped = 1;
 	apic_printk(APIC_VERBOSE,"mapped APIC to %16lx (%16lx)\n", APIC_BASE, apic_phys);
 
 	/*
diff --git a/trunk/arch/x86_64/kernel/smp.c b/trunk/arch/x86_64/kernel/smp.c
index 06af6ca60129..2df988bbf312 100644
--- a/trunk/arch/x86_64/kernel/smp.c
+++ b/trunk/arch/x86_64/kernel/smp.c
@@ -526,7 +526,7 @@ int safe_smp_processor_id(void)
 {
 	unsigned apicid, i;
 
-	if (disable_apic)
+	if (disable_apic || !apic_mapped)
 		return 0;
 
 	apicid = hard_smp_processor_id();
diff --git a/trunk/include/asm-x86_64/apic.h b/trunk/include/asm-x86_64/apic.h
index 29ee735278f2..9e66d32330c9 100644
--- a/trunk/include/asm-x86_64/apic.h
+++ b/trunk/include/asm-x86_64/apic.h
@@ -18,6 +18,7 @@
 extern int apic_verbosity;
 extern int apic_runs_main_timer;
 extern int ioapic_force;
+extern int apic_mapped;
 
 /*
  * Define the default level of output to be very little