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, 4 insertions, 4 deletions

diff --git a/arch/parisc/include/asm/bug.h b/arch/parisc/include/asm/bug.h
index 75e46c557a16..72cfdb0cfdd1 100644
--- a/arch/parisc/include/asm/bug.h
+++ b/arch/parisc/include/asm/bug.h
@@ -44,7 +44,7 @@
 #endif
 
 #ifdef CONFIG_DEBUG_BUGVERBOSE
-#define __WARN()                                                        \
+#define __WARN_TAINT(taint)                                             \
         do {                                                            \
                 asm volatile("\n"                                       \
                              "1:\t" PARISC_BUG_BREAK_ASM "\n"           \
@@ -54,11 +54,11 @@
                              "\t.org 2b+%c3\n"                          \
                              "\t.popsection"                            \
                              : : "i" (__FILE__), "i" (__LINE__),        \
-                             "i" (BUGFLAG_WARNING),                     \
+                             "i" (BUGFLAG_TAINT(taint)),                \
                              "i" (sizeof(struct bug_entry)) );          \
         } while(0)
 #else
-#define __WARN()                                                        \
+#define __WARN_TAINT(taint)                                             \
         do {                                                            \
                 asm volatile("\n"                                       \
                              "1:\t" PARISC_BUG_BREAK_ASM "\n"           \
@@ -67,7 +67,7 @@
                              "\t.short %c0\n"                           \
                              "\t.org 2b+%c1\n"                          \
                              "\t.popsection"                            \
-                             : : "i" (BUGFLAG_WARNING),                 \
+                             : : "i" (BUGFLAG_TAINT(taint)),            \
                              "i" (sizeof(struct bug_entry)) );          \
         } while(0)
 #endif