Pull vtd-iommu into release branch
Tony Luck [Fri, 17 Oct 2008 20:52:22 +0000 (13:52 -0700)]
Conflicts:
arch/ia64/kernel/acpi.c

1  2 
arch/ia64/Kconfig
arch/ia64/Makefile
arch/ia64/include/asm/machvec.h
arch/ia64/kernel/Makefile
arch/ia64/kernel/acpi.c

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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)
        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