Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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()
+12
-6
+6
arch/x86/kernel/apic/x2apic_phys.c
+6
arch/x86/kernel/apic/x2apic_phys.c
···
24
24
{
25
25
if (x2apic_phys)
26
26
return x2apic_enabled();
27
+
else if ((acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) &&
28
+
(acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL) &&
29
+
x2apic_enabled()) {
30
+
printk(KERN_DEBUG "System requires x2apic physical mode\n");
31
+
return 1;
32
+
}
27
33
else
28
34
return 0;
29
35
}
+4
-4
arch/x86/kernel/cpu/intel_cacheinfo.c
+4
-4
arch/x86/kernel/cpu/intel_cacheinfo.c
···
433
433
/* check if @slot is already used or the index is already disabled */
434
434
ret = amd_get_l3_disable_slot(nb, slot);
435
435
if (ret >= 0)
436
-
return -EINVAL;
436
+
return -EEXIST;
437
437
438
438
if (index > nb->l3_cache.indices)
439
439
return -EINVAL;
440
440
441
441
/* check whether the other slot has disabled the same index already */
442
442
if (index == amd_get_l3_disable_slot(nb, !slot))
443
-
return -EINVAL;
443
+
return -EEXIST;
444
444
445
445
amd_l3_disable_index(nb, cpu, slot, index);
446
446
···
468
468
err = amd_set_l3_disable_slot(this_leaf->base.nb, cpu, slot, val);
469
469
if (err) {
470
470
if (err == -EEXIST)
471
-
printk(KERN_WARNING "L3 disable slot %d in use!\n",
472
-
slot);
471
+
pr_warning("L3 slot %d in use/index already disabled!\n",
472
+
slot);
473
473
return err;
474
474
}
475
475
return count;
+2
-2
arch/x86/platform/mrst/mrst.c
+2
-2
arch/x86/platform/mrst/mrst.c
···
805
805
} else
806
806
i2c_register_board_info(i2c_bus[i], i2c_devs[i], 1);
807
807
}
808
-
intel_scu_notifier_post(SCU_AVAILABLE, 0L);
808
+
intel_scu_notifier_post(SCU_AVAILABLE, NULL);
809
809
}
810
810
EXPORT_SYMBOL_GPL(intel_scu_devices_create);
811
811
···
814
814
{
815
815
int i;
816
816
817
-
intel_scu_notifier_post(SCU_DOWN, 0L);
817
+
intel_scu_notifier_post(SCU_DOWN, NULL);
818
818
819
819
for (i = 0; i < ipc_next_dev; i++)
820
820
platform_device_del(ipc_devs[i]);