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

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1289906913 0
# Node ID 9b2ca938cfe6c0639471e24634bc4a48d889b412
# Parent  87f248de52304bc96a80dc093250fed0197f37e0
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/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 87f248de5230 -r 9b2ca938cfe6 
xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
--- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h     Mon Nov 15 09:31:38 
2010 +0000
+++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h     Tue Nov 16 11:28:33 
2010 +0000
@@ -30,9 +30,6 @@
         &amd_iommu_head, list)
 
 #define DMA_32BIT_MASK  0x00000000ffffffffULL
-
-extern int amd_iommu_debug;
-extern int amd_iommu_perdev_intremap;
 
 #define AMD_IOMMU_DEBUG(fmt, args...) \
     do  \
diff -r 87f248de5230 -r 9b2ca938cfe6 xen/include/xen/iommu.h
--- a/xen/include/xen/iommu.h   Mon Nov 15 09:31:38 2010 +0000
+++ b/xen/include/xen/iommu.h   Tue Nov 16 11:28:33 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;
 
 extern struct rangeset *mmio_ro_ranges;
 

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