diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2008-12-12 07:53:54 -0500 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-01-03 08:11:57 -0500 |
commit | c226f853091577e665ebc02c064af4834d8d4f28 (patch) | |
tree | 8f5921882509057efd8e81f70039dfe51a1f9012 | |
parent | 0cfd7aa90be83a4d278810d231f9ef03f189b4f0 (diff) |
AMD IOMMU: convert amd_iommu_isolate to bool
Impact: cleanup
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
-rw-r--r-- | arch/x86/include/asm/amd_iommu_types.h | 2 | ||||
-rw-r--r-- | arch/x86/kernel/amd_iommu_init.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/include/asm/amd_iommu_types.h b/arch/x86/include/asm/amd_iommu_types.h index c4b144ece1f8..7abf9cf0c1fe 100644 --- a/arch/x86/include/asm/amd_iommu_types.h +++ b/arch/x86/include/asm/amd_iommu_types.h | |||
@@ -381,7 +381,7 @@ extern struct protection_domain **amd_iommu_pd_table; | |||
381 | extern unsigned long *amd_iommu_pd_alloc_bitmap; | 381 | extern unsigned long *amd_iommu_pd_alloc_bitmap; |
382 | 382 | ||
383 | /* will be 1 if device isolation is enabled */ | 383 | /* will be 1 if device isolation is enabled */ |
384 | extern int amd_iommu_isolate; | 384 | extern bool amd_iommu_isolate; |
385 | 385 | ||
386 | /* | 386 | /* |
387 | * If true, the addresses will be flushed on unmap time, not when | 387 | * If true, the addresses will be flushed on unmap time, not when |
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c index c625800c55ca..47e163b4431e 100644 --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c | |||
@@ -122,7 +122,8 @@ u16 amd_iommu_last_bdf; /* largest PCI device id we have | |||
122 | LIST_HEAD(amd_iommu_unity_map); /* a list of required unity mappings | 122 | LIST_HEAD(amd_iommu_unity_map); /* a list of required unity mappings |
123 | we find in ACPI */ | 123 | we find in ACPI */ |
124 | unsigned amd_iommu_aperture_order = 26; /* size of aperture in power of 2 */ | 124 | unsigned amd_iommu_aperture_order = 26; /* size of aperture in power of 2 */ |
125 | int amd_iommu_isolate = 1; /* if 1, device isolation is enabled */ | 125 | bool amd_iommu_isolate = true; /* if true, device isolation is |
126 | enabled */ | ||
126 | bool amd_iommu_unmap_flush; /* if true, flush on every unmap */ | 127 | bool amd_iommu_unmap_flush; /* if true, flush on every unmap */ |
127 | 128 | ||
128 | LIST_HEAD(amd_iommu_list); /* list of all AMD IOMMUs in the | 129 | LIST_HEAD(amd_iommu_list); /* list of all AMD IOMMUs in the |
@@ -1218,9 +1219,9 @@ static int __init parse_amd_iommu_options(char *str) | |||
1218 | { | 1219 | { |
1219 | for (; *str; ++str) { | 1220 | for (; *str; ++str) { |
1220 | if (strncmp(str, "isolate", 7) == 0) | 1221 | if (strncmp(str, "isolate", 7) == 0) |
1221 | amd_iommu_isolate = 1; | 1222 | amd_iommu_isolate = true; |
1222 | if (strncmp(str, "share", 5) == 0) | 1223 | if (strncmp(str, "share", 5) == 0) |
1223 | amd_iommu_isolate = 0; | 1224 | amd_iommu_isolate = false; |
1224 | if (strncmp(str, "fullflush", 9) == 0) | 1225 | if (strncmp(str, "fullflush", 9) == 0) |
1225 | amd_iommu_unmap_flush = true; | 1226 | amd_iommu_unmap_flush = true; |
1226 | } | 1227 | } |