diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-03-29 17:31:49 +0100 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-03-29 17:31:49 +0100 |
| commit | 8c240452b9851b8c546cc62777a39f177cf565d9 (patch) | |
| tree | 3c4542f08141dc67d36b052f06b9afee94a6bb7b | |
| parent | 4865cebd3f8defdf958c379244484078a5bf4c98 (diff) | |
| download | xen-8c240452b9851b8c546cc62777a39f177cf565d9.tar.gz xen-8c240452b9851b8c546cc62777a39f177cf565d9.tar.bz2 xen-8c240452b9851b8c546cc62777a39f177cf565d9.zip | |
Fix backport of 23225:3f00c5faa12a.
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Keir Fraser <keir@xen.org>
| -rw-r--r-- | xen/arch/x86/domain.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 4cccb431d1..6afbf0e076 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -558,9 +558,9 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) d->arch.is_32bit_pv = d->arch.has_32bit_shinfo = (CONFIG_PAGING_LEVELS != 4); - spin_lock_init(&d->arch.e820_lock); } + spin_lock_init(&d->arch.e820_lock); memset(d->arch.cpuids, 0, sizeof(d->arch.cpuids)); for ( i = 0; i < MAX_CPUID_INPUT; i++ ) { @@ -605,8 +605,8 @@ void arch_domain_destroy(struct domain *d) if ( is_hvm_domain(d) ) hvm_domain_destroy(d); - else - xfree(d->arch.e820); + + xfree(d->arch.e820); vmce_destroy_msr(d); free_domain_pirqs(d); |