diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 17:25:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 17:25:01 -0700 |
| commit | 0961d6581c870850342ad6ea25263763433d666f (patch) | |
| tree | 371c61fd7f621397907983031003e784a040402e /lib | |
| parent | 1756ac3d3c41341297ea25b818b7fce505bb2a9a (diff) | |
| parent | fd0c8894893cba722bdea12de25b49f980795d06 (diff) | |
| download | linux-3.10-0961d6581c870850342ad6ea25263763433d666f.tar.gz linux-3.10-0961d6581c870850342ad6ea25263763433d666f.tar.bz2 linux-3.10-0961d6581c870850342ad6ea25263763433d666f.zip | |
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 'lib')
| -rw-r--r-- | lib/bug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bug.c b/lib/bug.c index 300e41afbf9..f13daf43521 100644 --- a/lib/bug.c +++ b/lib/bug.c @@ -165,7 +165,7 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs) (void *)bugaddr); show_regs(regs); - add_taint(TAINT_WARN); + add_taint(BUG_GET_TAINT(bug)); return BUG_TRAP_TYPE_WARN; } |