From a15318fb24cb2ff3615c3260eecbb189086c3dce Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Fri, 8 Oct 2010 14:53:48 -0400 Subject: [PATCH] --- yaml --- r: 212247 b: refs/heads/master c: 6e9636693373d938aa3b13427be3d212f172ac06 h: refs/heads/master i: 212245: 8216c10bcbd4aca75da79f08caa770d82ffa0796 212243: 0faf2cd51e1b28792d9f0ec83ecebd22ab77ebe4 212239: af56e4b98b92a7298a548b06d7eefabd80c4b3b4 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/iommu_table.h | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1f6c6a11d244..2a7e772b10d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc6a2f37d084173de57fe75f73cbe4bb296b9e8a +refs/heads/master: 6e9636693373d938aa3b13427be3d212f172ac06 diff --git a/trunk/arch/x86/include/asm/iommu_table.h b/trunk/arch/x86/include/asm/iommu_table.h index df55a78888e3..f229b13a5f30 100644 --- a/trunk/arch/x86/include/asm/iommu_table.h +++ b/trunk/arch/x86/include/asm/iommu_table.h @@ -1,4 +1,3 @@ - #ifndef _ASM_X86_IOMMU_TABLE_H #define _ASM_X86_IOMMU_TABLE_H @@ -60,7 +59,7 @@ struct iommu_table_entry { * and it will be run after the SWIOTLB and the other IOMMUs * that utilize this macro. If the IOMMU is detected (ie, the * detect routine returns a positive value), the other IOMMUs - * are also checked. You can use IOMMU_INIT_FINISH if you prefer + * are also checked. You can use IOMMU_INIT_POST_FINISH if you prefer * to stop detecting the other IOMMUs after yours has been detected. */ #define IOMMU_INIT_POST(_detect) \ @@ -80,9 +79,9 @@ struct iommu_table_entry { * d). Similar to the 'init', except that this gets called from pci_iommu_init * where we do have a memory allocator. * - * The _CONT vs the _EXIT differs in that the _CONT variant will + * The standard vs the _FINISH differs in that the _FINISH variant will * continue detecting other IOMMUs in the call list after the - * the detection routine returns a positive number. The _EXIT will + * the detection routine returns a positive number. The _FINISH will * stop the execution chain. Both will still call the 'init' and * 'late_init' functions if they are set. */