Patch to fix ARM build
5cac6219-xen-cpu-Fix-ARM-build-following-cs-597fbb8.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=626
This commit is contained in:
@@ -28,6 +28,7 @@ Mon Apr 8 08:13:04 MDT 2019 - carnold@suse.com
|
||||
5ca46b68-x86emul-no-GPR-update-upon-AVX-gather-failures.patch
|
||||
5ca773d1-x86emul-dont-read-mask-reg-without-AVX512F.patch
|
||||
5cab1f66-timers-fix-memory-leak-with-cpu-plug.patch
|
||||
5cac6219-xen-cpu-Fix-ARM-build-following-cs-597fbb8.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 4 08:53:02 UTC 2019 - ohering@suse.de
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
# needssslcertforbuild
|
||||
|
||||
@@ -127,7 +127,7 @@ BuildRequires: makeinfo
|
||||
BuildRequires: pesign-obs-integration
|
||||
%endif
|
||||
|
||||
Version: 4.12.0_09
|
||||
Version: 4.12.0_10
|
||||
Release: 0
|
||||
Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel)
|
||||
License: GPL-2.0-only
|
||||
@@ -174,7 +174,8 @@ Patch9: 5c9e63c5-credit2-SMT-idle-handling.patch
|
||||
Patch10: 5ca46b68-x86emul-no-GPR-update-upon-AVX-gather-failures.patch
|
||||
Patch11: 5ca773d1-x86emul-dont-read-mask-reg-without-AVX512F.patch
|
||||
Patch12: 5cab1f66-timers-fix-memory-leak-with-cpu-plug.patch
|
||||
Patch13: VMX-del_msr-accounting.patch
|
||||
Patch13: 5cac6219-xen-cpu-Fix-ARM-build-following-cs-597fbb8.patch
|
||||
Patch14: VMX-del_msr-accounting.patch
|
||||
# Our platform specific patches
|
||||
Patch400: xen-destdir.patch
|
||||
Patch401: vif-bridge-no-iptables.patch
|
||||
@@ -385,6 +386,7 @@ Authors:
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
# Our platform specific patches
|
||||
%patch400 -p1
|
||||
%patch401 -p1
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
Subject: xen/cpu: Fix ARM build following c/s 597fbb8
|
||||
From: Andrew Cooper andrew.cooper3@citrix.com Mon Apr 8 18:20:07 2019 +0100
|
||||
Date: Tue Apr 9 10:12:57 2019 +0100:
|
||||
Git: a6448adfd3d537aacbbd784e5bf1777ab3ff5f85
|
||||
|
||||
c/s 597fbb8 "xen/timers: Fix memory leak with cpu unplug/plug" broke the ARM
|
||||
build by being the first patch to add park_offline_cpus to common code.
|
||||
|
||||
While it is currently specific to Intel hardware (for reasons of being able to
|
||||
handle machine check exceptions without an immediate system reset), it isn't
|
||||
inherently architecture specific, so define it to be false on ARM for now.
|
||||
|
||||
Add a comment in both smp.h headers explaining the intended behaviour of the
|
||||
option.
|
||||
|
||||
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
||||
Reviewed-by: Julien Grall <julien.grall@arm.com>
|
||||
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
|
||||
|
||||
diff --git a/xen/include/asm-arm/smp.h b/xen/include/asm-arm/smp.h
|
||||
index 3c122681d7..fdbcefa241 100644
|
||||
--- a/xen/include/asm-arm/smp.h
|
||||
+++ b/xen/include/asm-arm/smp.h
|
||||
@@ -14,6 +14,12 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask);
|
||||
|
||||
#define raw_smp_processor_id() (get_processor_id())
|
||||
|
||||
+/*
|
||||
+ * Do we, for platform reasons, need to actually keep CPUs online when we
|
||||
+ * would otherwise prefer them to be off?
|
||||
+ */
|
||||
+#define park_offline_cpus false
|
||||
+
|
||||
extern void noreturn stop_cpu(void);
|
||||
|
||||
extern int arch_smp_init(void);
|
||||
diff --git a/xen/include/asm-x86/smp.h b/xen/include/asm-x86/smp.h
|
||||
index 09c55458df..9f533f9072 100644
|
||||
--- a/xen/include/asm-x86/smp.h
|
||||
+++ b/xen/include/asm-x86/smp.h
|
||||
@@ -26,6 +26,10 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_mask);
|
||||
DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask);
|
||||
DECLARE_PER_CPU(cpumask_var_t, scratch_cpumask);
|
||||
|
||||
+/*
|
||||
+ * Do we, for platform reasons, need to actually keep CPUs online when we
|
||||
+ * would otherwise prefer them to be off?
|
||||
+ */
|
||||
extern bool park_offline_cpus;
|
||||
|
||||
void smp_send_nmi_allbutself(void);
|
||||
Reference in New Issue
Block a user