diff options
| author | Keir Fraser <keir@xen.org> | 2010-11-16 11:54:48 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2010-11-16 11:54:48 +0000 |
| commit | 5b10c85aa5bb408ed76351bd32264fc14efc6a6d (patch) | |
| tree | a35b92b5b2cb5e9d85d10a243ecb657bc74db3a9 | |
| parent | 9e4cb5bbf891dae540051e550d2dd77659639ed0 (diff) | |
| download | xen-5b10c85aa5bb408ed76351bd32264fc14efc6a6d.tar.gz xen-5b10c85aa5bb408ed76351bd32264fc14efc6a6d.tar.bz2 xen-5b10c85aa5bb408ed76351bd32264fc14efc6a6d.zip | |
amd iommu: Fix HV crash with 32bit pv_ops kernel
Signed-off-by: Wei Wang <wei.wang2@amd.com>
Tested-by: Conny Seidel <conny.seidel@amd.com>
xen-unstable changeset: 22389:9b2ca938cfe6
xen-unstable date: Tue Nov 16 11:28:33 2010 +0000
| -rw-r--r-- | xen/include/asm-x86/hvm/svm/amd-iommu-proto.h | 3 | ||||
| -rw-r--r-- | xen/include/xen/iommu.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h index 594bb21e22..5539636981 100644 --- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h +++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h @@ -32,9 +32,6 @@ #define DMA_32BIT_MASK 0x00000000ffffffffULL #define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK) -extern int amd_iommu_debug; -extern int amd_iommu_perdev_intremap; - #define AMD_IOMMU_DEBUG(fmt, args...) \ do \ { \ diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 443a0407e1..711cf81fc9 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -30,6 +30,8 @@ extern bool_t iommu_enabled; extern bool_t force_iommu, iommu_verbose; extern bool_t iommu_workaround_bios_bug, iommu_passthrough; extern bool_t iommu_snoop, iommu_qinval, iommu_intremap; +extern bool_t amd_iommu_debug; +extern bool_t amd_iommu_perdev_intremap; #define domain_hvm_iommu(d) (&d->arch.hvm_domain.hvm_iommu) |