Commit c28c4851 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar.

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic: Use x2apic physical mode based on FADT setting
  x86/mrst: Quiet sparse noise about plain integer as NULL pointer
  x86, intel_cacheinfo: Fix error return code in amd_set_l3_disable_slot()
parents daae677f ea0dcf90
...@@ -24,6 +24,12 @@ static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id) ...@@ -24,6 +24,12 @@ static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
{ {
if (x2apic_phys) if (x2apic_phys)
return x2apic_enabled(); return x2apic_enabled();
else if ((acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) &&
(acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL) &&
x2apic_enabled()) {
printk(KERN_DEBUG "System requires x2apic physical mode\n");
return 1;
}
else else
return 0; return 0;
} }
......
...@@ -433,14 +433,14 @@ int amd_set_l3_disable_slot(struct amd_northbridge *nb, int cpu, unsigned slot, ...@@ -433,14 +433,14 @@ int amd_set_l3_disable_slot(struct amd_northbridge *nb, int cpu, unsigned slot,
/* check if @slot is already used or the index is already disabled */ /* check if @slot is already used or the index is already disabled */
ret = amd_get_l3_disable_slot(nb, slot); ret = amd_get_l3_disable_slot(nb, slot);
if (ret >= 0) if (ret >= 0)
return -EINVAL; return -EEXIST;
if (index > nb->l3_cache.indices) if (index > nb->l3_cache.indices)
return -EINVAL; return -EINVAL;
/* check whether the other slot has disabled the same index already */ /* check whether the other slot has disabled the same index already */
if (index == amd_get_l3_disable_slot(nb, !slot)) if (index == amd_get_l3_disable_slot(nb, !slot))
return -EINVAL; return -EEXIST;
amd_l3_disable_index(nb, cpu, slot, index); amd_l3_disable_index(nb, cpu, slot, index);
...@@ -468,8 +468,8 @@ static ssize_t store_cache_disable(struct _cpuid4_info *this_leaf, ...@@ -468,8 +468,8 @@ static ssize_t store_cache_disable(struct _cpuid4_info *this_leaf,
err = amd_set_l3_disable_slot(this_leaf->base.nb, cpu, slot, val); err = amd_set_l3_disable_slot(this_leaf->base.nb, cpu, slot, val);
if (err) { if (err) {
if (err == -EEXIST) if (err == -EEXIST)
printk(KERN_WARNING "L3 disable slot %d in use!\n", pr_warning("L3 slot %d in use/index already disabled!\n",
slot); slot);
return err; return err;
} }
return count; return count;
......
...@@ -805,7 +805,7 @@ void intel_scu_devices_create(void) ...@@ -805,7 +805,7 @@ void intel_scu_devices_create(void)
} else } else
i2c_register_board_info(i2c_bus[i], i2c_devs[i], 1); i2c_register_board_info(i2c_bus[i], i2c_devs[i], 1);
} }
intel_scu_notifier_post(SCU_AVAILABLE, 0L); intel_scu_notifier_post(SCU_AVAILABLE, NULL);
} }
EXPORT_SYMBOL_GPL(intel_scu_devices_create); EXPORT_SYMBOL_GPL(intel_scu_devices_create);
...@@ -814,7 +814,7 @@ void intel_scu_devices_destroy(void) ...@@ -814,7 +814,7 @@ void intel_scu_devices_destroy(void)
{ {
int i; int i;
intel_scu_notifier_post(SCU_DOWN, 0L); intel_scu_notifier_post(SCU_DOWN, NULL);
for (i = 0; i < ipc_next_dev; i++) for (i = 0; i < ipc_next_dev; i++)
platform_device_del(ipc_devs[i]); platform_device_del(ipc_devs[i]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment