diff options
Diffstat (limited to 'arch/x86/kernel/apic/apic_flat_64.c')
| -rw-r--r-- | arch/x86/kernel/apic/apic_flat_64.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c index 306e5e88fb6..d0c99abc26c 100644 --- a/arch/x86/kernel/apic/apic_flat_64.c +++ b/arch/x86/kernel/apic/apic_flat_64.c @@ -161,7 +161,7 @@ static int flat_apic_id_registered(void)  static int flat_phys_pkg_id(int initial_apic_id, int index_msb)  { -	return hard_smp_processor_id() >> index_msb; +	return initial_apic_id >> index_msb;  }  struct apic apic_flat =  { @@ -235,7 +235,7 @@ static int physflat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)  	 * regardless of how many processors are present (x86_64 ES7000  	 * is an example).  	 */ -	if (acpi_gbl_FADT.header.revision > FADT2_REVISION_ID && +	if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&  		(acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL)) {  		printk(KERN_DEBUG "system APIC only can use physical flat");  		return 1;  |