aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/amd_iommu_init.c
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2009-09-01 10:43:58 -0400
committerJoerg Roedel <joerg.roedel@amd.com>2009-09-03 09:49:56 -0400
commit4c6f40d4e0f0bba77a5f27eec4e1c6d1c457d324 (patch)
treef70ee59a48c3ace23c4bfebe8f6c975f1b4578b4 /arch/x86/kernel/amd_iommu_init.c
parentf2430bd104bec2706315e9e983a9d9f828ff9565 (diff)
x86/amd-iommu: replace "AMD IOMMU" by "AMD-Vi"
This patch replaces the "AMD IOMMU" printk strings with the official name for the hardware: "AMD-Vi". Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch/x86/kernel/amd_iommu_init.c')
-rw-r--r--arch/x86/kernel/amd_iommu_init.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index c1b17e97252e..169958ad6243 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -252,7 +252,7 @@ static void __init iommu_feature_disable(struct amd_iommu *iommu, u8 bit)
252/* Function to enable the hardware */ 252/* Function to enable the hardware */
253static void iommu_enable(struct amd_iommu *iommu) 253static void iommu_enable(struct amd_iommu *iommu)
254{ 254{
255 printk(KERN_INFO "AMD IOMMU: Enabling IOMMU at %s cap 0x%hx\n", 255 printk(KERN_INFO "AMD-Vi: Enabling IOMMU at %s cap 0x%hx\n",
256 dev_name(&iommu->dev->dev), iommu->cap_ptr); 256 dev_name(&iommu->dev->dev), iommu->cap_ptr);
257 257
258 iommu_feature_enable(iommu, CONTROL_IOMMU_EN); 258 iommu_feature_enable(iommu, CONTROL_IOMMU_EN);
@@ -902,7 +902,7 @@ static int __init iommu_setup_msi(struct amd_iommu *iommu)
902 902
903 r = request_irq(iommu->dev->irq, amd_iommu_int_handler, 903 r = request_irq(iommu->dev->irq, amd_iommu_int_handler,
904 IRQF_SAMPLE_RANDOM, 904 IRQF_SAMPLE_RANDOM,
905 "AMD IOMMU", 905 "AMD-Vi",
906 NULL); 906 NULL);
907 907
908 if (r) { 908 if (r) {
@@ -1150,7 +1150,7 @@ int __init amd_iommu_init(void)
1150 1150
1151 1151
1152 if (no_iommu) { 1152 if (no_iommu) {
1153 printk(KERN_INFO "AMD IOMMU disabled by kernel command line\n"); 1153 printk(KERN_INFO "AMD-Vi disabled by kernel command line\n");
1154 return 0; 1154 return 0;
1155 } 1155 }
1156 1156
@@ -1248,16 +1248,16 @@ int __init amd_iommu_init(void)
1248 1248
1249 enable_iommus(); 1249 enable_iommus();
1250 1250
1251 printk(KERN_INFO "AMD IOMMU: device isolation "); 1251 printk(KERN_INFO "AMD-Vi: device isolation ");
1252 if (amd_iommu_isolate) 1252 if (amd_iommu_isolate)
1253 printk("enabled\n"); 1253 printk("enabled\n");
1254 else 1254 else
1255 printk("disabled\n"); 1255 printk("disabled\n");
1256 1256
1257 if (amd_iommu_unmap_flush) 1257 if (amd_iommu_unmap_flush)
1258 printk(KERN_INFO "AMD IOMMU: IO/TLB flush on unmap enabled\n"); 1258 printk(KERN_INFO "AMD-Vi: IO/TLB flush on unmap enabled\n");
1259 else 1259 else
1260 printk(KERN_INFO "AMD IOMMU: Lazy IO/TLB flushing enabled\n"); 1260 printk(KERN_INFO "AMD-Vi: Lazy IO/TLB flushing enabled\n");
1261 1261
1262out: 1262out:
1263 return ret; 1263 return ret;