diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2013-05-24 12:58:52 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2013-05-24 13:00:26 -0400 |
| commit | 00db28f1cadf8d8448a096cc778c52b96865b48d (patch) | |
| tree | 495302438abba3647dbcf8f3213d379f49b35275 | |
| parent | a63cdb706f3bc99f79338ef3eaa04b2730fd59e6 (diff) | |
| download | kernel-00db28f1cadf8d8448a096cc778c52b96865b48d.tar.gz kernel-00db28f1cadf8d8448a096cc778c52b96865b48d.tar.xz kernel-00db28f1cadf8d8448a096cc778c52b96865b48d.zip | |
Add patch to quiet irq remapping failures (rhbz 948262)
| -rw-r--r-- | intel_iommu-Downgrade-the-warning-if-enabling-irq-remapping-fails.patch | 25 | ||||
| -rw-r--r-- | kernel.spec | 11 |
2 files changed, 35 insertions, 1 deletions
diff --git a/intel_iommu-Downgrade-the-warning-if-enabling-irq-remapping-fails.patch b/intel_iommu-Downgrade-the-warning-if-enabling-irq-remapping-fails.patch new file mode 100644 index 000000000..424d60350 --- /dev/null +++ b/intel_iommu-Downgrade-the-warning-if-enabling-irq-remapping-fails.patch @@ -0,0 +1,25 @@ +This triggers on a MacBook Pro. + +Signed-off-by: Andy Lutomirski <luto@amacapital.net> +https://bugzilla.redhat.com/show_bug.cgi?id=948262 +--- + drivers/iommu/intel_irq_remapping.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c +index f3b8f23..a7e0ad1 100644 +--- a/drivers/iommu/intel_irq_remapping.c ++++ b/drivers/iommu/intel_irq_remapping.c +@@ -654,8 +654,7 @@ error: + */ + + if (x2apic_present) +- WARN(1, KERN_WARNING +- "Failed to enable irq remapping. You are vulnerable to irq-injection attacks.\n"); ++ pr_warn("Failed to enable irq remapping. You are vulnerable to irq-injection attacks.\n"); + + return -1; + } +-- +1.8.1.4 + diff --git a/kernel.spec b/kernel.spec index f9e346c79..01a48accf 100644 --- a/kernel.spec +++ b/kernel.spec @@ -62,7 +62,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -734,6 +734,9 @@ Patch25021: radeon-use-max_bus-speed-to-activate-gen2-speeds.patch #rhbz 964367 Patch25023: hp-wmi-fix-incorrect-rfkill-set-hw-state.patch +#rhbz 948262 +Patch25024: intel_iommu-Downgrade-the-warning-if-enabling-irq-remapping-fails.patch + # END OF PATCH DEFINITIONS %endif @@ -1415,6 +1418,9 @@ ApplyPatch radeon-use-max_bus-speed-to-activate-gen2-speeds.patch #rhbz 964367 ApplyPatch hp-wmi-fix-incorrect-rfkill-set-hw-state.patch +#rhbz 948262 +ApplyPatch intel_iommu-Downgrade-the-warning-if-enabling-irq-remapping-fails.patch + # END OF PATCH APPLICATIONS %endif @@ -2220,6 +2226,9 @@ fi # ||----w | # || || %changelog +* Fri May 24 2013 Josh Boyer <jwboyer@redhat.com> +- Add patch to quiet irq remapping failures (rhbz 948262) + * Fri May 24 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc2.git3.1 - Linux v3.10-rc2-328-g0e255f1 |