From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 26 Sep 2011 13:08:34 +0000 (+0200)
Subject: Merge branch 'core/iommu' into auto-latest
X-Git-Tag: next-20110927~20^2~9
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=abef6681ff3184a285e7d974648dbc6a88f538b8;p=karo-tx-linux.git

Merge branch 'core/iommu' into auto-latest
---

abef6681ff3184a285e7d974648dbc6a88f538b8
diff --cc drivers/iommu/intr_remapping.c
index 73a903491f2c,cfb0dd4bf0b6..07c9f189f314
--- a/drivers/iommu/intr_remapping.c
+++ b/drivers/iommu/intr_remapping.c
@@@ -498,9 -507,18 +507,18 @@@ static void iommu_disable_intr_remappin
  		      readl, !(sts & DMA_GSTS_IRES), sts);
  
  end:
 -	spin_unlock_irqrestore(&iommu->register_lock, flags);
 +	raw_spin_unlock_irqrestore(&iommu->register_lock, flags);
  }
  
+ static int __init dmar_x2apic_optout(void)
+ {
+ 	struct acpi_table_dmar *dmar;
+ 	dmar = (struct acpi_table_dmar *)dmar_tbl;
+ 	if (!dmar || no_x2apic_optout)
+ 		return 0;
+ 	return dmar->flags & DMAR_X2APIC_OPT_OUT;
+ }
+ 
  int __init intr_remapping_supported(void)
  {
  	struct dmar_drhd_unit *drhd;