1 files changed, 2 insertions, 1 deletions

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 9f548cb4a958..e38e21754eea 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -840,7 +840,8 @@ int __cpuinit native_cpu_up(unsigned int cpu)
         pr_debug("++++++++++++++++++++=_---CPU UP  %u\n", cpu);
 
         if (apicid == BAD_APICID || apicid == boot_cpu_physical_apicid ||
-            !physid_isset(apicid, phys_cpu_present_map)) {
+            !physid_isset(apicid, phys_cpu_present_map) ||
+            (!x2apic_mode && apicid >= 255)) {
                 printk(KERN_ERR "%s: bad cpu %d\n", __func__, cpu);
                 return -EINVAL;
         }