History

Merge tag 'stable/for-linus-4.0-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen bugfixes from David Vrabel: "Xen regression and bug fixes for 4.0-rc1 - Fix two regressions introduced in 4.0-rc1 affecting PV/PVH guests in certain configurations. - Prevent pvscsi frontends bypassing backend checks. - Allow privcmd hypercalls to be preempted even on kernel with voluntary preemption. This fixes soft-lockups with long running toolstack hypercalls (e.g., when creating/destroying large domains)" * tag 'stable/for-linus-4.0-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: x86/xen: Initialize cr4 shadow for 64-bit PV(H) guests xen-scsiback: mark pvscsi frontend request consumed only after last read x86/xen: allow privcmd hypercalls to be preempted x86/xen: Make sure X2APIC_ENABLE bit of MSR_IA32_APICBASE is not set

Linus Torvalds committed 11 years ago

Commit b24e2bd2 parents 84257ce 5054daa8 files · +104 −10Browse files

Showing the changes to include (1 of 8 files). Show all

Unified · Split

include/xen/xen-ops.h+26−0
@@ -46,4 +46,30 @@ static inline efi_system_table_t __init *xen_efi_probe(void) · 45 unmodified lines
4646 }
4747 #endif
4848
49+#ifdef CONFIG_PREEMPT
50+
51+static inline void xen_preemptible_hcall_begin(void)
52+{
53+}
54+
55+static inline void xen_preemptible_hcall_end(void)
56+{
57+}
58+
59+#else
60+
61+DECLARE_PER_CPU(bool, xen_in_preemptible_hcall);
62+
63+static inline void xen_preemptible_hcall_begin(void)
64+{
65+ __this_cpu_write(xen_in_preemptible_hcall, true);
66+}
67+
68+static inline void xen_preemptible_hcall_end(void)
69+{
70+ __this_cpu_write(xen_in_preemptible_hcall, false);
71+}
72+
73+#endif /* CONFIG_PREEMPT */
74+
4975 #endif /* INCLUDE_XEN_OPS_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t