Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 212247
b: refs/heads/master
c: 6e96366
h: refs/heads/master
i:
  212245: 8216c10
  212243: 0faf2cd
  212239: af56e4b
v: v3
  • Loading branch information
Konrad Rzeszutek Wilk authored and H. Peter Anvin committed Oct 8, 2010
1 parent dcde7d1 commit a15318f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fc6a2f37d084173de57fe75f73cbe4bb296b9e8a
refs/heads/master: 6e9636693373d938aa3b13427be3d212f172ac06
7 changes: 3 additions & 4 deletions trunk/arch/x86/include/asm/iommu_table.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#ifndef _ASM_X86_IOMMU_TABLE_H
#define _ASM_X86_IOMMU_TABLE_H

Expand Down Expand Up @@ -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) \
Expand All @@ -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.
*/
Expand Down

0 comments on commit a15318f

Please sign in to comment.