diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 20:25:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 20:25:01 -0400 |
| commit | 0961d6581c870850342ad6ea25263763433d666f (patch) | |
| tree | 371c61fd7f621397907983031003e784a040402e /arch/powerpc | |
| parent | 1756ac3d3c41341297ea25b818b7fce505bb2a9a (diff) | |
| parent | fd0c8894893cba722bdea12de25b49f980795d06 (diff) | |
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.
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/include/asm/bug.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/bug.h b/arch/powerpc/include/asm/bug.h index 2c15212e1700..065c590c991d 100644 --- a/arch/powerpc/include/asm/bug.h +++ b/arch/powerpc/include/asm/bug.h | |||
| @@ -85,12 +85,12 @@ | |||
| 85 | } \ | 85 | } \ |
| 86 | } while (0) | 86 | } while (0) |
| 87 | 87 | ||
| 88 | #define __WARN() do { \ | 88 | #define __WARN_TAINT(taint) do { \ |
| 89 | __asm__ __volatile__( \ | 89 | __asm__ __volatile__( \ |
| 90 | "1: twi 31,0,0\n" \ | 90 | "1: twi 31,0,0\n" \ |
| 91 | _EMIT_BUG_ENTRY \ | 91 | _EMIT_BUG_ENTRY \ |
| 92 | : : "i" (__FILE__), "i" (__LINE__), \ | 92 | : : "i" (__FILE__), "i" (__LINE__), \ |
| 93 | "i" (BUGFLAG_WARNING), \ | 93 | "i" (BUGFLAG_TAINT(taint)), \ |
| 94 | "i" (sizeof(struct bug_entry))); \ | 94 | "i" (sizeof(struct bug_entry))); \ |
| 95 | } while (0) | 95 | } while (0) |
| 96 | 96 | ||
| @@ -104,7 +104,7 @@ | |||
| 104 | "1: "PPC_TLNEI" %4,0\n" \ | 104 | "1: "PPC_TLNEI" %4,0\n" \ |
| 105 | _EMIT_BUG_ENTRY \ | 105 | _EMIT_BUG_ENTRY \ |
| 106 | : : "i" (__FILE__), "i" (__LINE__), \ | 106 | : : "i" (__FILE__), "i" (__LINE__), \ |
| 107 | "i" (BUGFLAG_WARNING), \ | 107 | "i" (BUGFLAG_TAINT(TAINT_WARN)), \ |
| 108 | "i" (sizeof(struct bug_entry)), \ | 108 | "i" (sizeof(struct bug_entry)), \ |
| 109 | "r" (__ret_warn_on)); \ | 109 | "r" (__ret_warn_on)); \ |
| 110 | } \ | 110 | } \ |