diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2010-05-06 11:44:42 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2010-05-06 11:44:42 +0100 |
commit | d9998d5853e5387adffbecb69fd280d87672760d (patch) | |
tree | d8e0ed4cc997fc6c8501ccebbdd13af7715e4972 | |
parent | 727bc17d20f0c0324722cb8670801f28664af88c (diff) | |
download | xen-d9998d5853e5387adffbecb69fd280d87672760d.tar.gz xen-d9998d5853e5387adffbecb69fd280d87672760d.tar.bz2 xen-d9998d5853e5387adffbecb69fd280d87672760d.zip |
iommu: add missing __init annotations
Signed-off-by: Jan Beulich <jbeulich@novell.com>
-rw-r--r-- | xen/drivers/passthrough/amd/pci_amd_iommu.c | 2 | ||||
-rw-r--r-- | xen/drivers/passthrough/iommu.c | 2 | ||||
-rw-r--r-- | xen/drivers/passthrough/vtd/extern.h | 1 | ||||
-rw-r--r-- | xen/drivers/passthrough/vtd/iommu.c | 14 |
4 files changed, 9 insertions, 10 deletions
diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index 6db10faf68..fc9bb29d62 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -158,7 +158,7 @@ static void amd_iommu_setup_dom0_devices(struct domain *d) spin_unlock(&pcidevs_lock); } -int amd_iov_detect(void) +int __init amd_iov_detect(void) { INIT_LIST_HEAD(&amd_iommu_head); diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index f83e0746ef..2989ced86f 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -277,7 +277,7 @@ int deassign_device(struct domain *d, u8 bus, u8 devfn) return ret; } -int iommu_setup(void) +int __init iommu_setup(void) { int rc = -ENODEV; diff --git a/xen/drivers/passthrough/vtd/extern.h b/xen/drivers/passthrough/vtd/extern.h index 4f75f3f749..2e923922d6 100644 --- a/xen/drivers/passthrough/vtd/extern.h +++ b/xen/drivers/passthrough/vtd/extern.h @@ -48,7 +48,6 @@ struct iommu * ioapic_to_iommu(unsigned int apic_id); struct acpi_drhd_unit * ioapic_to_drhd(unsigned int apic_id); struct acpi_drhd_unit * iommu_to_drhd(struct iommu *iommu); struct acpi_rhsa_unit * drhd_to_rhsa(struct acpi_drhd_unit *drhd); -void clear_fault_bits(struct iommu *iommu); int ats_device(int seg, int bus, int devfn); int enable_ats_device(int seg, int bus, int devfn); int disable_ats_device(int seg, int bus, int devfn); diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index f217dfc978..71143cf4f7 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -109,7 +109,7 @@ static int context_set_domain_id(struct context_entry *context, return 0; } -static struct intel_iommu *alloc_intel_iommu(void) +static struct intel_iommu *__init alloc_intel_iommu(void) { struct intel_iommu *intel; @@ -124,7 +124,7 @@ static struct intel_iommu *alloc_intel_iommu(void) return intel; } -static void free_intel_iommu(struct intel_iommu *intel) +static void __init free_intel_iommu(struct intel_iommu *intel) { xfree(intel); } @@ -1037,7 +1037,7 @@ static int iommu_set_interrupt(struct iommu *iommu) return irq; } -static int iommu_alloc(struct acpi_drhd_unit *drhd) +static int __init iommu_alloc(struct acpi_drhd_unit *drhd) { struct iommu *iommu; unsigned long sagaw, nr_dom; @@ -1131,7 +1131,7 @@ static int iommu_alloc(struct acpi_drhd_unit *drhd) return 0; } -static void iommu_free(struct acpi_drhd_unit *drhd) +static void __init iommu_free(struct acpi_drhd_unit *drhd) { struct iommu *iommu = drhd->iommu; @@ -1779,7 +1779,7 @@ static void setup_dom0_devices(struct domain *d) spin_unlock(&pcidevs_lock); } -void clear_fault_bits(struct iommu *iommu) +static void clear_fault_bits(struct iommu *iommu) { u64 val; unsigned long flags; @@ -1912,7 +1912,7 @@ static void setup_dom0_rmrr(struct domain *d) spin_unlock(&pcidevs_lock); } -static void platform_quirks(void) +static void __init platform_quirks(void) { u32 id; @@ -1925,7 +1925,7 @@ static void platform_quirks(void) } } -int intel_vtd_setup(void) +int __init intel_vtd_setup(void) { struct acpi_drhd_unit *drhd; struct iommu *iommu; |