From ed0d58c980ee407b205699ff77451ed1df061415 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Thu, 26 Jun 2008 21:27:40 +0200
Subject: [PATCH] --- yaml --- r: 99603 b: refs/heads/master c:
 928abd2545fe367ea3ff3cb8a5076e1d6d2a9574 h: refs/heads/master i:   99601:
 940ecaa49d14e97d63e587046256e86e596c689e   99599:
 771f87becf2085f790f00011c046d07b6d4656bd v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/x86/kernel/amd_iommu_init.c | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b80bcb94e3c9..8eea2f292e49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6e2e6b6fc465bc3cc4eae8d53fcf573ca1cfa14
+refs/heads/master: 928abd2545fe367ea3ff3cb8a5076e1d6d2a9574
diff --git a/trunk/arch/x86/kernel/amd_iommu_init.c b/trunk/arch/x86/kernel/amd_iommu_init.c
index 6fce5ab683d8..0ad8cf9e7ba2 100644
--- a/trunk/arch/x86/kernel/amd_iommu_init.c
+++ b/trunk/arch/x86/kernel/amd_iommu_init.c
@@ -99,3 +99,20 @@ struct ivmd_header {
 	u64 range_length;
 } __attribute__((packed));
 
+static int __initdata amd_iommu_disable;
+
+u16 amd_iommu_last_bdf;
+struct list_head amd_iommu_unity_map;
+unsigned amd_iommu_aperture_order = 26;
+int amd_iommu_isolate;
+
+struct list_head amd_iommu_list;
+struct dev_table_entry *amd_iommu_dev_table;
+u16 *amd_iommu_alias_table;
+struct amd_iommu **amd_iommu_rlookup_table;
+struct protection_domain **amd_iommu_pd_table;
+unsigned long *amd_iommu_pd_alloc_bitmap;
+
+static u32 dev_table_size;
+static u32 alias_table_size;
+static u32 rlookup_table_size;