Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Fix vSMP boot crash
x86, xen: Initialize cx to suppress warning
x86, xen: Suppress WP test on Xen
+10
arch/x86/kernel/apic/probe_64.c
+10
arch/x86/kernel/apic/probe_64.c
···
44
44
NULL,
45
45
};
46
46
47
+
static int apicid_phys_pkg_id(int initial_apic_id, int index_msb)
48
+
{
49
+
return hard_smp_processor_id() >> index_msb;
50
+
}
51
+
47
52
/*
48
53
* Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.
49
54
*/
···
72
67
if (max_physical_apicid >= 8)
73
68
apic = &apic_physflat;
74
69
printk(KERN_INFO "Setting APIC routing to %s\n", apic->name);
70
+
}
71
+
72
+
if (is_vsmp_box()) {
73
+
/* need to update phys_pkg_id */
74
+
apic->phys_pkg_id = apicid_phys_pkg_id;
75
75
}
76
76
77
77
/*
+2
arch/x86/xen/enlighten.c
+2
arch/x86/xen/enlighten.c
···
215
215
(1 << X86_FEATURE_ACPI)); /* disable ACPI */
216
216
217
217
ax = 1;
218
+
cx = 0;
218
219
xen_cpuid(&ax, &bx, &cx, &dx);
219
220
220
221
/* cpuid claims we support xsave; try enabling it to see what happens */
···
1060
1059
/* set up basic CPUID stuff */
1061
1060
cpu_detect(&new_cpu_data);
1062
1061
new_cpu_data.hard_math = 1;
1062
+
new_cpu_data.wp_works_ok = 1;
1063
1063
new_cpu_data.x86_capability[0] = cpuid_edx(1);
1064
1064
#endif
1065
1065