Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cacaf51 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iommu-fixes-v3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu 

Pull two IOMMU fixes from Joerg Roedel:
 "The first is an additional fix for the OMAP initialization order issue
  and the second patch fixes a possible section mismatch which can lead
  to a kernel crash in the AMD IOMMU driver when suspend/resume is used
  and the compiler has not inlined the iommu_set_device_table function."

* tag 'iommu-fixes-v3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  x86/amd: iommu_set_device_table() must not be __init
  ARM: OMAP: fix iommu, not mailbox
parents 45b8da90 6b7f000e

arch/arm/mach-omap2/mailbox.c

+1 −2
Original line number Diff line number Diff line
@@ -420,8 +420,7 @@ static void __exit omap2_mbox_exit(void) 
	platform_driver_unregister(&omap2_mbox_driver);

}



/* must be ready before omap3isp is probed */

subsys_initcall(omap2_mbox_init);

module_init(omap2_mbox_init);

module_exit(omap2_mbox_exit);



MODULE_LICENSE("GPL v2");

arch/arm/mach-omap2/omap-iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -150,7 +150,8 @@ err_out: 
		platform_device_put(omap_iommu_pdev[i]);

	return err;

}

module_init(omap_iommu_init);

/* must be ready before omap3isp is probed */

subsys_initcall(omap_iommu_init);



static void __exit omap_iommu_exit(void)

{

drivers/iommu/amd_iommu_init.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static void iommu_set_exclusion_range(struct amd_iommu *iommu) 
}



/* Programs the physical address of the device table into the IOMMU hardware */

static void __init iommu_set_device_table(struct amd_iommu *iommu)

static void iommu_set_device_table(struct amd_iommu *iommu)

{

	u64 entry;