diff -r 388c44a63613 xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
--- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h	Wed Nov 10 14:56:06 2010 +0000
+++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h	Mon Nov 15 14:49:52 2010 +0100
@@ -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 388c44a63613 xen/include/xen/iommu.h
--- a/xen/include/xen/iommu.h	Wed Nov 10 14:56:06 2010 +0000
+++ b/xen/include/xen/iommu.h	Mon Nov 15 14:49:52 2010 +0100
@@ -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;