Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 323979
b: refs/heads/master
c: ae13b7b
h: refs/heads/master
i:
  323977: aa83126
  323975: 20e4e0f
v: v3
  • Loading branch information
Mathias Krause authored and Ingo Molnar committed Sep 5, 2012
1 parent 29f0a0f commit 91403f3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 2b11afd1ab502d959ae8d6d5812923151b5bc505
refs/heads/master: ae13b7b4e041eccf34fa4dd58581fe1441375578
4 changes: 2 additions & 2 deletions trunk/arch/x86/include/asm/iommu_table.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ struct iommu_table_entry {
* to stop detecting the other IOMMUs after yours has been detected.
*/
#define IOMMU_INIT_POST(_detect) \
__IOMMU_INIT(_detect, pci_swiotlb_detect_4gb, 0, 0, 0)
__IOMMU_INIT(_detect, pci_swiotlb_detect_4gb, NULL, NULL, 0)

#define IOMMU_INIT_POST_FINISH(detect) \
__IOMMU_INIT(_detect, pci_swiotlb_detect_4gb, 0, 0, 1)
__IOMMU_INIT(_detect, pci_swiotlb_detect_4gb, NULL, NULL, 1)

/*
* A more sophisticated version of IOMMU_INIT. This variant requires:
Expand Down

0 comments on commit 91403f3

Please sign in to comment.