From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752914Ab0HZR7D (ORCPT ); Thu, 26 Aug 2010 13:59:03 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:19114 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752296Ab0HZR66 (ORCPT >); Thu, 26 Aug 2010 13:58:58 -0400 From: Konrad Rzeszutek Wilk To: hpa@zytor.com, fujita.tomonori@lab.ntt.co.jp, linux-kernel@vger.kernel.org Cc: Konrad Rzeszutek Wilk , Muli Ben-Yehuda , "Jon D. Mason" , "Darrick J. Wong" Subject: [PATCH 07/10] x86/calgary: Make Calgary IOMMU use IOMMU_INIT_* macros. Date: Thu, 26 Aug 2010 13:58:02 -0400 Message-Id: <1282845485-8991-8-git-send-email-konrad.wilk@oracle.com> X-Mailer: git-send-email 1.7.0.1 In-Reply-To: <1282845485-8991-1-git-send-email-konrad.wilk@oracle.com> References: <1282845485-8991-1-git-send-email-konrad.wilk@oracle.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We utilize the IOMMU_INIT macros to create this dependency: [pci_xen_swiotlb_detect] | [pci_swiotlb_detect_override] | [pci_swiotlb_detect_4gb] | [detect_calgary] Meaning that 'detect_calgary' is going to be called after 'pci_swiotlb_detect'. Signed-off-by: Konrad Rzeszutek Wilk CC: Muli Ben-Yehuda CC: "Jon D. Mason" CC: "Darrick J. Wong" CC: H. Peter Anvin CC: Fujita Tomonori --- arch/x86/kernel/pci-calgary_64.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index 28c6b38..f56a117 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c @@ -47,6 +47,7 @@ #include #include #include +#include #ifdef CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT int use_calgary __read_mostly = 1; @@ -1595,3 +1596,5 @@ static int __init calgary_fixup_tce_spaces(void) * and before device_initcall. */ rootfs_initcall(calgary_fixup_tce_spaces); + +IOMMU_INIT_POST(detect_calgary); -- 1.7.0.1