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

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

diff --combined arch/arm/mach-omap2/mailbox.c
index 2cc1aa0,609ea2d..415a6f1
--- 1/arch/arm/mach-omap2/mailbox.c
--- 2/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@@ -281,16 -281,8 +281,16 @@@ static struct omap_mbox mbox_iva_info 
        .ops    = &omap2_mbox_ops,
        .priv   = &omap2_mbox_iva_priv,
  };
 +#endif
  
 -struct omap_mbox *omap2_mboxes[] = { &mbox_dsp_info, &mbox_iva_info, NULL };
 +#ifdef CONFIG_ARCH_OMAP2
 +struct omap_mbox *omap2_mboxes[] = {
 +      &mbox_dsp_info,
 +#ifdef CONFIG_SOC_OMAP2420
 +      &mbox_iva_info,
 +#endif
 +      NULL
 +};
  #endif
  
  #if defined(CONFIG_ARCH_OMAP4)
@@@ -420,8 -412,7 +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");