diff options
author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2010-08-26 13:58:01 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-08-26 18:14:06 -0400 |
commit | 5cb3a267939a223eb84692d229569d2ef493d7ca (patch) | |
tree | 689c687df5247936d15f17214824da07f4101d32 /arch/x86/xen/pci-swiotlb-xen.c | |
parent | c116c5457c46edb767df6f4e36d4905e3514ad37 (diff) |
x86, xen-swiotlb: Make Xen-SWIOTLB use IOMMU_INIT_* macros.
We utilize the IOMMU_INIT macros to create this dependency:
[null]
|
[pci_xen_swiotlb_detect]
|
[pci_swiotlb_detect_override]
|
[pci_swiotlb_detect_4gb]
In other words, we set 'pci_xen_swiotlb_detect' to be
the first detection to be run during start.
CC: Fujita Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
LKML-Reference: <1282845485-8991-7-git-send-email-konrad.wilk@oracle.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/xen/pci-swiotlb-xen.c')
-rw-r--r-- | arch/x86/xen/pci-swiotlb-xen.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/xen/pci-swiotlb-xen.c b/arch/x86/xen/pci-swiotlb-xen.c index a013ec9d0c54..22471001b74c 100644 --- a/arch/x86/xen/pci-swiotlb-xen.c +++ b/arch/x86/xen/pci-swiotlb-xen.c | |||
@@ -5,6 +5,7 @@ | |||
5 | 5 | ||
6 | #include <asm/xen/hypervisor.h> | 6 | #include <asm/xen/hypervisor.h> |
7 | #include <xen/xen.h> | 7 | #include <xen/xen.h> |
8 | #include <asm/iommu_table.h> | ||
8 | 9 | ||
9 | int xen_swiotlb __read_mostly; | 10 | int xen_swiotlb __read_mostly; |
10 | 11 | ||
@@ -56,3 +57,7 @@ void __init pci_xen_swiotlb_init(void) | |||
56 | dma_ops = &xen_swiotlb_dma_ops; | 57 | dma_ops = &xen_swiotlb_dma_ops; |
57 | } | 58 | } |
58 | } | 59 | } |
60 | IOMMU_INIT_FINISH(pci_xen_swiotlb_detect, | ||
61 | 0, | ||
62 | pci_xen_swiotlb_init, | ||
63 | 0); | ||