Merge git://git.infradead.org/iommu-2.6

* git://git.infradead.org/iommu-2.6:
  intel-iommu: Set a more specific taint flag for invalid BIOS DMAR tables
  intel-iommu: Combine the BIOS DMAR table warning messages
  panic: Add taint flag TAINT_FIRMWARE_WORKAROUND ('I')
  panic: Allow warnings to set different taint flags
  intel-iommu: intel_iommu_map_range failed at very end of address space
  intel-iommu: errors with smaller iommu widths
  intel-iommu: Fix boot inside 64bit virtualbox with io-apic disabled
  intel-iommu: use physfn to search drhd for VF
  intel-iommu: Print out iommu seq_id
  intel-iommu: Don't complain that ACPI_DMAR_SCOPE_TYPE_IOAPIC is not supported
  intel-iommu: Avoid global flushes with caching mode.
  intel-iommu: Use correct domain ID when caching mode is enabled
  intel-iommu mistakenly uses offset_pfn when caching mode is enabled
  intel-iommu: use for_each_set_bit()
  intel-iommu: Fix section mismatch dmar_ir_support() uses dmar_tbl.

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/sh/include/asm/bug.h b/arch/sh/include/asm/bug.h
index d02c01b3e6b..6323f864d11 100644
--- a/arch/sh/include/asm/bug.h
+++ b/arch/sh/include/asm/bug.h
@@ -48,7 +48,7 @@ do {							\
                    "i" (sizeof(struct bug_entry)));     \
 } while (0)
 
-#define __WARN()                                        \
+#define __WARN_TAINT(taint)                             \
 do {                                                    \
         __asm__ __volatile__ (                          \
                 "1:\t.short %O0\n"                      \
@@ -57,7 +57,7 @@ do {							\
                  : "n" (TRAPA_BUG_OPCODE),              \
                    "i" (__FILE__),                      \
                    "i" (__LINE__),                      \
-                   "i" (BUGFLAG_WARNING),               \
+                   "i" (BUGFLAG_TAINT(taint)),          \
                    "i" (sizeof(struct bug_entry)));     \
 } while (0)