[Xen-changelog] [xen-4.0-testing] amd iommu: Fix HV crash with 32bit pv_ops kernel

["Xen patchbot-4.0-testing" <patchbot-4.0-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1289908488 0
# Node ID e9156d9d996b75b4251a30d2d7eb1ccc7c3009cb
# Parent  9507fac4e8924075e920b034f59ee9567f66b7e4
amd iommu: Fix HV crash with 32bit pv_ops kernel

Signed-off-by: Wei Wang <wei.wang2@xxxxxxx>
Tested-by: Conny Seidel <conny.seidel@xxxxxxx>
xen-unstable changeset:   22389:9b2ca938cfe6
xen-unstable date:        Tue Nov 16 11:28:33 2010 +0000
---
 xen/include/asm-x86/hvm/svm/amd-iommu-proto.h |    3 ---
 xen/include/xen/iommu.h                       |    2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff -r 9507fac4e892 -r e9156d9d996b 
xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
--- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h     Tue Nov 16 11:53:33 
2010 +0000
+++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h     Tue Nov 16 11:54:48 
2010 +0000
@@ -31,9 +31,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 -r 9507fac4e892 -r e9156d9d996b xen/include/xen/iommu.h
--- a/xen/include/xen/iommu.h   Tue Nov 16 11:53:33 2010 +0000
+++ b/xen/include/xen/iommu.h   Tue Nov 16 11:54:48 2010 +0000
@@ -30,6 +30,8 @@ extern bool_t force_iommu, iommu_verbose
 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)
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog