aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/amd_iommu_init.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index 5d9e45c7cea2..c54c82305af4 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -101,8 +101,6 @@ struct ivmd_header {
101 u64 range_length; 101 u64 range_length;
102} __attribute__((packed)); 102} __attribute__((packed));
103 103
104static int __initdata amd_iommu_disable;
105
106u16 amd_iommu_last_bdf; 104u16 amd_iommu_last_bdf;
107struct list_head amd_iommu_unity_map; 105struct list_head amd_iommu_unity_map;
108unsigned amd_iommu_aperture_order = 26; 106unsigned amd_iommu_aperture_order = 26;
@@ -686,7 +684,7 @@ int __init amd_iommu_init(void)
686 int i, ret = 0; 684 int i, ret = 0;
687 685
688 686
689 if (amd_iommu_disable) { 687 if (no_iommu) {
690 printk(KERN_INFO "AMD IOMMU disabled by kernel command line\n"); 688 printk(KERN_INFO "AMD IOMMU disabled by kernel command line\n");
691 return 0; 689 return 0;
692 } 690 }
@@ -831,9 +829,6 @@ void __init amd_iommu_detect(void)
831 if (swiotlb || no_iommu || iommu_detected) 829 if (swiotlb || no_iommu || iommu_detected)
832 return; 830 return;
833 831
834 if (amd_iommu_disable)
835 return;
836
837 if (acpi_table_parse("IVRS", early_amd_iommu_detect) == 0) { 832 if (acpi_table_parse("IVRS", early_amd_iommu_detect) == 0) {
838 iommu_detected = 1; 833 iommu_detected = 1;
839#ifdef CONFIG_GART_IOMMU 834#ifdef CONFIG_GART_IOMMU
@@ -846,8 +841,6 @@ void __init amd_iommu_detect(void)
846static int __init parse_amd_iommu_options(char *str) 841static int __init parse_amd_iommu_options(char *str)
847{ 842{
848 for (; *str; ++str) { 843 for (; *str; ++str) {
849 if (strcmp(str, "off") == 0)
850 amd_iommu_disable = 1;
851 if (strcmp(str, "isolate") == 0) 844 if (strcmp(str, "isolate") == 0)
852 amd_iommu_isolate = 1; 845 amd_iommu_isolate = 1;
853 } 846 }