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/s390 | |
| 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/s390')
| -rw-r--r-- | arch/s390/include/asm/bug.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h index 9beeb9db9b23..bf90d1fd97a5 100644 --- a/arch/s390/include/asm/bug.h +++ b/arch/s390/include/asm/bug.h | |||
| @@ -46,18 +46,18 @@ | |||
| 46 | unreachable(); \ | 46 | unreachable(); \ |
| 47 | } while (0) | 47 | } while (0) |
| 48 | 48 | ||
| 49 | #define __WARN() do { \ | 49 | #define __WARN_TAINT(taint) do { \ |
| 50 | __EMIT_BUG(BUGFLAG_WARNING); \ | 50 | __EMIT_BUG(BUGFLAG_TAINT(taint)); \ |
| 51 | } while (0) | 51 | } while (0) |
| 52 | 52 | ||
| 53 | #define WARN_ON(x) ({ \ | 53 | #define WARN_ON(x) ({ \ |
| 54 | int __ret_warn_on = !!(x); \ | 54 | int __ret_warn_on = !!(x); \ |
| 55 | if (__builtin_constant_p(__ret_warn_on)) { \ | 55 | if (__builtin_constant_p(__ret_warn_on)) { \ |
| 56 | if (__ret_warn_on) \ | 56 | if (__ret_warn_on) \ |
| 57 | __EMIT_BUG(BUGFLAG_WARNING); \ | 57 | __WARN(); \ |
| 58 | } else { \ | 58 | } else { \ |
| 59 | if (unlikely(__ret_warn_on)) \ | 59 | if (unlikely(__ret_warn_on)) \ |
| 60 | __EMIT_BUG(BUGFLAG_WARNING); \ | 60 | __WARN(); \ |
| 61 | } \ | 61 | } \ |
| 62 | unlikely(__ret_warn_on); \ | 62 | unlikely(__ret_warn_on); \ |
| 63 | }) | 63 | }) |