From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Jan Beulich" Subject: [PATCH] iommu: add missing __ini annotations Date: Tue, 04 May 2010 16:52:34 +0100 Message-ID: <4BE05EE20200007800001321@vpn.id2.novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part5379F5D2.0__=" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part5379F5D2.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Signed-off-by: Jan Beulich --- 2010-05-04.orig/xen/drivers/passthrough/amd/pci_amd_iommu.c 2009-10-29 = 12:24:49.000000000 +0100 +++ 2010-05-04/xen/drivers/passthrough/amd/pci_amd_iommu.c 2010-05-04 = 13:22:15.000000000 +0200 @@ -158,7 +158,7 @@ static void amd_iommu_setup_dom0_devices spin_unlock(&pcidevs_lock); } =20 -int amd_iov_detect(void) +int __init amd_iov_detect(void) { INIT_LIST_HEAD(&amd_iommu_head); =20 --- 2010-05-04.orig/xen/drivers/passthrough/iommu.c 2010-03-18 = 14:53:21.000000000 +0100 +++ 2010-05-04/xen/drivers/passthrough/iommu.c 2010-05-04 13:22:15.0000000= 00 +0200 @@ -277,7 +277,7 @@ int deassign_device(struct domain *d, u8 return ret; } =20 -int iommu_setup(void) +int __init iommu_setup(void) { int rc =3D -ENODEV; =20 --- 2010-05-04.orig/xen/drivers/passthrough/vtd/extern.h 2009-08-07 = 09:20:56.000000000 +0200 +++ 2010-05-04/xen/drivers/passthrough/vtd/extern.h 2010-05-04 = 13:22:15.000000000 +0200 @@ -48,7 +48,6 @@ struct iommu * ioapic_to_iommu(unsigned=20 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); --- 2010-05-04.orig/xen/drivers/passthrough/vtd/iommu.c 2010-04-22 = 14:43:25.000000000 +0200 +++ 2010-05-04/xen/drivers/passthrough/vtd/iommu.c 2010-05-04 = 13:22:15.000000000 +0200 @@ -109,7 +109,7 @@ static int context_set_domain_id(struct=20 return 0; } =20 -static struct intel_iommu *alloc_intel_iommu(void) +static struct intel_iommu *__init alloc_intel_iommu(void) { struct intel_iommu *intel; =20 @@ -124,7 +124,7 @@ static struct intel_iommu *alloc_intel_i return intel; } =20 -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 io return irq; } =20 -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_ return 0; } =20 -static void iommu_free(struct acpi_drhd_unit *drhd) +static void __init iommu_free(struct acpi_drhd_unit *drhd) { struct iommu *iommu =3D drhd->iommu; =20 @@ -1779,7 +1779,7 @@ static void setup_dom0_devices(struct do spin_unlock(&pcidevs_lock); } =20 -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 domai spin_unlock(&pcidevs_lock); } =20 -static void platform_quirks(void) +static void __init platform_quirks(void) { u32 id; =20 @@ -1925,7 +1925,7 @@ static void platform_quirks(void) } } =20 -int intel_vtd_setup(void) +int __init intel_vtd_setup(void) { struct acpi_drhd_unit *drhd; struct iommu *iommu; --=__Part5379F5D2.0__= Content-Type: text/plain; name="iommu-init-annotate.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="iommu-init-annotate.patch" Signed-off-by: Jan Beulich =0A=0A--- 2010-05-04.orig/x= en/drivers/passthrough/amd/pci_amd_iommu.c 2009-10-29 12:24:49.0000000= 00 +0100=0A+++ 2010-05-04/xen/drivers/passthrough/amd/pci_amd_iommu.c = 2010-05-04 13:22:15.000000000 +0200=0A@@ -158,7 +158,7 @@ static void = amd_iommu_setup_dom0_devices=0A spin_unlock(&pcidevs_lock);=0A }=0A = =0A-int amd_iov_detect(void)=0A+int __init amd_iov_detect(void)=0A {=0A = INIT_LIST_HEAD(&amd_iommu_head);=0A =0A--- 2010-05-04.orig/xen/drivers/pas= sthrough/iommu.c 2010-03-18 14:53:21.000000000 +0100=0A+++ = 2010-05-04/xen/drivers/passthrough/iommu.c 2010-05-04 13:22:15.0000000= 00 +0200=0A@@ -277,7 +277,7 @@ int deassign_device(struct domain *d, u8=0A = return ret;=0A }=0A =0A-int iommu_setup(void)=0A+int __init iommu_setup= (void)=0A {=0A int rc =3D -ENODEV;=0A =0A--- 2010-05-04.orig/xen/driver= s/passthrough/vtd/extern.h 2009-08-07 09:20:56.000000000 +0200=0A+++ = 2010-05-04/xen/drivers/passthrough/vtd/extern.h 2010-05-04 13:22:15.0000000= 00 +0200=0A@@ -48,7 +48,6 @@ struct iommu * ioapic_to_iommu(unsigned =0A = struct acpi_drhd_unit * ioapic_to_drhd(unsigned int apic_id);=0A struct = acpi_drhd_unit * iommu_to_drhd(struct iommu *iommu);=0A struct acpi_rhsa_un= it * drhd_to_rhsa(struct acpi_drhd_unit *drhd);=0A-void clear_fault_bits(st= ruct iommu *iommu);=0A int ats_device(int seg, int bus, int devfn);=0A int = enable_ats_device(int seg, int bus, int devfn);=0A int disable_ats_device(i= nt seg, int bus, int devfn);=0A--- 2010-05-04.orig/xen/drivers/passthrough/= vtd/iommu.c 2010-04-22 14:43:25.000000000 +0200=0A+++ 2010-05-04/xen/dr= ivers/passthrough/vtd/iommu.c 2010-05-04 13:22:15.000000000 +0200=0A@@ = -109,7 +109,7 @@ static int context_set_domain_id(struct =0A return = 0;=0A }=0A =0A-static struct intel_iommu *alloc_intel_iommu(void)=0A+static= struct intel_iommu *__init alloc_intel_iommu(void)=0A {=0A struct = intel_iommu *intel;=0A =0A@@ -124,7 +124,7 @@ static struct intel_iommu = *alloc_intel_i=0A return intel;=0A }=0A =0A-static void free_intel_iomm= u(struct intel_iommu *intel)=0A+static void __init free_intel_iommu(struct = intel_iommu *intel)=0A {=0A xfree(intel);=0A }=0A@@ -1037,7 +1037,7 @@ = static int iommu_set_interrupt(struct io=0A return irq;=0A }=0A = =0A-static int iommu_alloc(struct acpi_drhd_unit *drhd)=0A+static int = __init iommu_alloc(struct acpi_drhd_unit *drhd)=0A {=0A struct iommu = *iommu;=0A unsigned long sagaw, nr_dom;=0A@@ -1131,7 +1131,7 @@ static = int iommu_alloc(struct acpi_drhd_=0A return 0;=0A }=0A =0A-static void = iommu_free(struct acpi_drhd_unit *drhd)=0A+static void __init iommu_free(st= ruct acpi_drhd_unit *drhd)=0A {=0A struct iommu *iommu =3D drhd->iommu;= =0A =0A@@ -1779,7 +1779,7 @@ static void setup_dom0_devices(struct do=0A = spin_unlock(&pcidevs_lock);=0A }=0A =0A-void clear_fault_bits(struct = iommu *iommu)=0A+static void clear_fault_bits(struct iommu *iommu)=0A {=0A = u64 val;=0A unsigned long flags;=0A@@ -1912,7 +1912,7 @@ static = void setup_dom0_rmrr(struct domai=0A spin_unlock(&pcidevs_lock);=0A = }=0A =0A-static void platform_quirks(void)=0A+static void __init platform_q= uirks(void)=0A {=0A u32 id;=0A =0A@@ -1925,7 +1925,7 @@ static void = platform_quirks(void)=0A }=0A }=0A =0A-int intel_vtd_setup(void)=0A+int= __init intel_vtd_setup(void)=0A {=0A struct acpi_drhd_unit *drhd;=0A = struct iommu *iommu;=0A --=__Part5379F5D2.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=__Part5379F5D2.0__=--