From 9f4f8ee22da4a81759cb98c1c62bf99b697fb524 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Fri, 22 May 2009 12:44:03 +0200 Subject: [PATCH] --- yaml --- r: 145897 b: refs/heads/master c: 2e8b569614b89c9b1b85cba37db36daeeeff744e h: refs/heads/master i: 145895: 254372321e2218f70c7d17f2760bb2e7a4a9c993 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/amd_iommu_init.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fd9e49975125..01a791bc5d9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2be69c79e9a46a554fc3ff57d886e65e7a73eb72 +refs/heads/master: 2e8b569614b89c9b1b85cba37db36daeeeff744e diff --git a/trunk/arch/x86/kernel/amd_iommu_init.c b/trunk/arch/x86/kernel/amd_iommu_init.c index b90a78cfdcb8..66941129e9c7 100644 --- a/trunk/arch/x86/kernel/amd_iommu_init.c +++ b/trunk/arch/x86/kernel/amd_iommu_init.c @@ -124,8 +124,14 @@ u16 amd_iommu_last_bdf; /* largest PCI device id we have LIST_HEAD(amd_iommu_unity_map); /* a list of required unity mappings we find in ACPI */ unsigned amd_iommu_aperture_order = 26; /* size of aperture in power of 2 */ + +#ifdef CONFIG_IOMMU_STRESS +bool amd_iommu_isolate = false; +#else bool amd_iommu_isolate = true; /* if true, device isolation is enabled */ +#endif + bool amd_iommu_unmap_flush; /* if true, flush on every unmap */ LIST_HEAD(amd_iommu_list); /* list of all AMD IOMMUs in the