Pull vtd-iommu into release branch

Conflicts:
	arch/ia64/kernel/acpi.c

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/ia64/Makefile
Simple merge

diff --cc arch/ia64/include/asm/machvec.h
Simple merge

diff --cc arch/ia64/kernel/Makefile
Simple merge

diff --cc arch/ia64/kernel/acpi.c
index 00936491933ee03c3c085c5f66a4aa9085658cd3,8cc2f8a610c4e6a397756d1cb27242d141e04da5..0635015d0aaada0de519d1b0487a787b41594db7
--- 1/arch/ia64/kernel/acpi.c
--- 2/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@@ -122,10 -124,20 +125,22 @@@ acpi_get_sysname(void
                        return "uv";
                else
                        return "sn2";
 +      } else if (xen_pv_domain() && !strcmp(hdr->oem_id, "XEN")) {
 +              return "xen";
        }
  
+ #ifdef CONFIG_DMAR
+       /* Look for Intel IOMMU */
+       nentries = (hdr->length - sizeof(*hdr)) /
+                        sizeof(xsdt->table_offset_entry[0]);
+       for (i = 0; i < nentries; i++) {
+               hdr = __va(xsdt->table_offset_entry[i]);
+               if (strncmp(hdr->signature, ACPI_SIG_DMAR,
+                       sizeof(ACPI_SIG_DMAR) - 1) == 0)
+                       return "dig_vtd";
+       }
+ #endif
+ 
        return "dig";
  #else
  # if defined (CONFIG_IA64_HP_SIM)
@@@ -140,8 -152,8 +155,10 @@@
        return "uv";
  # elif defined (CONFIG_IA64_DIG)
        return "dig";
 +# elif defined (CONFIG_IA64_XEN_GUEST)
 +      return "xen";
+ # elif defined(CONFIG_IA64_DIG_VTD)
+       return "dig_vtd";
  # else
  #     error Unknown platform.  Fix acpi.c.
  # endif