diff options
| author | Jan Beulich <jbeulich@suse.com> | 2012-06-28 16:04:12 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2012-06-28 16:04:12 +0200 |
| commit | c1f96709a67e3be8c030681cfecd131e23033dcc (patch) | |
| tree | ab76cd52bc0f02ec6cacb1565ee2d444d0d785a4 | |
| parent | 6f372739cb383fb3ac0fcf0897bdaa89eacdf8f1 (diff) | |
| download | xen-c1f96709a67e3be8c030681cfecd131e23033dcc.tar.gz xen-c1f96709a67e3be8c030681cfecd131e23033dcc.tar.bz2 xen-c1f96709a67e3be8c030681cfecd131e23033dcc.zip | |
arm: fix build after c/s 25477:e12e0b038219
Only x86 currently has a struct vcpu field arch.gdbsx_vcpu_event. But
as the whole function domain_pause_for_debugger() is pointless to be
compiled when there's no arch support, simply introduce another HAS_*
macro, enabled only on x86.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
| -rw-r--r-- | xen/Rules.mk | 1 | ||||
| -rw-r--r-- | xen/arch/x86/Rules.mk | 1 | ||||
| -rw-r--r-- | xen/common/domain.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/xen/Rules.mk b/xen/Rules.mk index 6123835ec1..f7cb8b2c86 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -51,6 +51,7 @@ CFLAGS-$(perfc) += -DPERF_COUNTERS CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE CFLAGS-$(HAS_ACPI) += -DHAS_ACPI +CFLAGS-$(HAS_GDBSX) += -DHAS_GDBSX CFLAGS-$(HAS_PASSTHROUGH) += -DHAS_PASSTHROUGH CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 65275af9e8..5312d7228d 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -8,6 +8,7 @@ HAS_PCI := y HAS_PASSTHROUGH := y HAS_NS16550 := y HAS_KEXEC := y +HAS_GDBSX := y xenoprof := y # diff --git a/xen/common/domain.c b/xen/common/domain.c index c21d18b548..4c5d241a2b 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -612,6 +612,7 @@ void vcpu_end_shutdown_deferral(struct vcpu *v) vcpu_check_shutdown(v); } +#ifdef HAS_GDBSX void domain_pause_for_debugger(void) { struct domain *d = current->domain; @@ -628,6 +629,7 @@ void domain_pause_for_debugger(void) if (current->arch.gdbsx_vcpu_event == 0) send_global_virq(VIRQ_DEBUGGER); } +#endif /* Complete domain destroy after RCU readers are not holding old references. */ static void complete_domain_destroy(struct rcu_head *head) |