summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-01-12 08:17:01 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-01-12 08:20:12 -0500
commitfe651573b718ba19bfd5e68365103f8747c9d9d1 (patch)
treec981a9a9f974788a406327eb02f1e49ece5e7f6d /kernel.spec
parentc60911c9944bb06d31b0fc5d9aeaf1731700d517 (diff)
downloadkernel-fe651573b718ba19bfd5e68365103f8747c9d9d1.tar.gz
kernel-fe651573b718ba19bfd5e68365103f8747c9d9d1.tar.xz
kernel-fe651573b718ba19bfd5e68365103f8747c9d9d1.zip
Add patch to fix loop in VDSO (rhbz 1178975)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index a4c08e9b4..84eb6dacb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -614,6 +614,9 @@ Patch26092: xhci-Add-broken-streams-quirk-for-Fresco-Logic-FL100.patch
Patch26093: uas-Add-US_FL_NO_ATA_1X-for-Seagate-devices-with-usb.patch
Patch26094: uas-Add-US_FL_NO_REPORT_OPCODES-for-JMicron-JMS566-w.patch
+#rhbz 1178975
+Patch26125: x86-vdso-Use-asm-volatile-in-__getcpu.patch
+
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
Patch30000: kernel-arm64.patch
@@ -1336,6 +1339,9 @@ ApplyPatch xhci-Add-broken-streams-quirk-for-Fresco-Logic-FL100.patch
ApplyPatch uas-Add-US_FL_NO_ATA_1X-for-Seagate-devices-with-usb.patch
ApplyPatch uas-Add-US_FL_NO_REPORT_OPCODES-for-JMicron-JMS566-w.patch
+#rhbz 1178975
+ApplyPatch x86-vdso-Use-asm-volatile-in-__getcpu.patch
+
%if 0%{?aarch64patches}
ApplyPatch kernel-arm64.patch
%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2202,6 +2208,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Jan 12 2015 Josh Boyer <jwboyer@fedoraproject.org>
+- Add patch to fix loop in VDSO (rhbz 1178975)
+
* Fri Jan 09 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc3.git2.1
- Linux v3.19-rc3-69-g11c8f01b423b