From 91403f30631f28e44c0c164b8a78637f6e939f13 Mon Sep 17 00:00:00 2001 From: Mathias Krause Date: Sun, 2 Sep 2012 23:31:46 +0200 Subject: [PATCH] --- yaml --- r: 323979 b: refs/heads/master c: ae13b7b4e041eccf34fa4dd58581fe1441375578 h: refs/heads/master i: 323977: aa831262c8160c7c38660852df8d03fc19a966b8 323975: 20e4e0fe132b65b582aed63b1347b7d754a725b1 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/iommu_table.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5591444a908d..6f082f43ee63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b11afd1ab502d959ae8d6d5812923151b5bc505 +refs/heads/master: ae13b7b4e041eccf34fa4dd58581fe1441375578 diff --git a/trunk/arch/x86/include/asm/iommu_table.h b/trunk/arch/x86/include/asm/iommu_table.h index bbf8fb2e3920..f42a04735a0a 100644 --- a/trunk/arch/x86/include/asm/iommu_table.h +++ b/trunk/arch/x86/include/asm/iommu_table.h @@ -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: