Commit f8a4bcab authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'x86/apic', 'x86/misc' and 'x86/splitlock' into x86/urgent 



Pick up these single-commit branches.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 3d77e6a8 de308d18 140fd4ac 429ac8b7

arch/x86/kernel/apic/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -2093,7 +2093,7 @@ void __init init_apic_mappings(void) 
	unsigned int new_apicid;



	if (apic_validate_deadline_timer())

		pr_debug("TSC deadline timer available\n");

		pr_info("TSC deadline timer available\n");



	if (x2apic_mode) {

		boot_cpu_physical_apicid = read_apic_id();

arch/x86/kernel/cpu/intel.c

+3 −0
Original line number Diff line number Diff line
@@ -1135,9 +1135,12 @@ void switch_to_sld(unsigned long tifn) 
static const struct x86_cpu_id split_lock_cpu_ids[] __initconst = {

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X,		0),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L,		0),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D,		0),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT,	1),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_D,	1),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT_L,	1),

	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L,		1),

	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE,		1),

	{}

};

arch/x86/kernel/reboot.c

+8 −0
Original line number Diff line number Diff line
@@ -197,6 +197,14 @@ static const struct dmi_system_id reboot_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5"),

		},

	},

	{	/* Handle problems with rebooting on Apple MacBook6,1 */

		.callback = set_pci_reboot,

		.ident = "Apple MacBook6,1",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "MacBook6,1"),

		},

	},

	{	/* Handle problems with rebooting on Apple MacBookPro5 */

		.callback = set_pci_reboot,

		.ident = "Apple MacBookPro5",