Commit f4131c62 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Ingo Molnar

x86: Make calgary_iommu_init() static

This makes calgary_iommu_init() static and moves it to remove
the forward declaration.
Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: muli@il.ibm.com
LKML-Reference: <20091114212603U.fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6959450e
...@@ -1345,7 +1345,24 @@ static void __init get_tce_space_from_tar(void) ...@@ -1345,7 +1345,24 @@ static void __init get_tce_space_from_tar(void)
return; return;
} }
int __init calgary_iommu_init(void); static int __init calgary_iommu_init(void)
{
int ret;
/* ok, we're trying to use Calgary - let's roll */
printk(KERN_INFO "PCI-DMA: Using Calgary IOMMU\n");
ret = calgary_init();
if (ret) {
printk(KERN_ERR "PCI-DMA: Calgary init failed %d, "
"falling back to no_iommu\n", ret);
return ret;
}
bad_dma_address = 0x0;
return 0;
}
void __init detect_calgary(void) void __init detect_calgary(void)
{ {
...@@ -1458,25 +1475,6 @@ void __init detect_calgary(void) ...@@ -1458,25 +1475,6 @@ void __init detect_calgary(void)
} }
} }
int __init calgary_iommu_init(void)
{
int ret;
/* ok, we're trying to use Calgary - let's roll */
printk(KERN_INFO "PCI-DMA: Using Calgary IOMMU\n");
ret = calgary_init();
if (ret) {
printk(KERN_ERR "PCI-DMA: Calgary init failed %d, "
"falling back to no_iommu\n", ret);
return ret;
}
bad_dma_address = 0x0;
return 0;
}
static int __init calgary_parse_options(char *p) static int __init calgary_parse_options(char *p)
{ {
unsigned int bridge; unsigned int bridge;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment