diff options
author | Keir Fraser <keir@xen.org> | 2013-01-14 13:55:45 +0000 |
---|---|---|
committer | Keir Fraser <keir@xen.org> | 2013-01-14 13:55:45 +0000 |
commit | 143c33f1bcc93392beea4c045dd19917bd81888f (patch) | |
tree | a2f9e6dc7aa16192ac00da84eff6beaf392b2055 /xen/arch/x86/x86_64 | |
parent | b07423c7cec88c19a63d7ed2c676b365af5d18c2 (diff) | |
download | xen-143c33f1bcc93392beea4c045dd19917bd81888f.tar.gz xen-143c33f1bcc93392beea4c045dd19917bd81888f.tar.bz2 xen-143c33f1bcc93392beea4c045dd19917bd81888f.zip |
x86: Assert !in_atomic() before exiting to guest context.
Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/arch/x86/x86_64')
-rw-r--r-- | xen/arch/x86/x86_64/compat/entry.S | 1 | ||||
-rw-r--r-- | xen/arch/x86/x86_64/entry.S | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 37c82a1c17..7051f90213 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -92,6 +92,7 @@ compat_skip_clobber: /* %rbx: struct vcpu */ ENTRY(compat_test_all_events) + ASSERT_NOT_IN_ATOMIC cli # tests must not race interrupts /*compat_test_softirqs:*/ movl VCPU_processor(%rbx),%eax diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 462b16fe65..408c348696 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -190,6 +190,7 @@ skip_clobber: /* %rbx: struct vcpu */ test_all_events: + ASSERT_NOT_IN_ATOMIC cli # tests must not race interrupts /*test_softirqs:*/ movl VCPU_processor(%rbx),%eax |