summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-02-26 08:14:54 -0500
committerJosh Boyer <jwboyer@redhat.com>2013-02-26 08:17:31 -0500
commit318f6554a39314d9f24636b448e38ccaea461d21 (patch)
tree773e6c29e8468d23bba12c9ff8cf727e596328c9 /kernel.spec
parentc040d8cac33ad4e991767be5acc66a8fada2a0a1 (diff)
downloadkernel-318f6554a39314d9f24636b448e38ccaea461d21.tar.gz
kernel-318f6554a39314d9f24636b448e38ccaea461d21.tar.xz
kernel-318f6554a39314d9f24636b448e38ccaea461d21.zip
Fix vmalloc_fault oops during lazy MMU (rhbz 914737)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec11
1 files changed, 10 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index c99d328e5..e73cfcae4 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
@@ -742,6 +742,9 @@ Patch21260: alps-v2.patch
#rhbz 903192
Patch21261: 0001-kmsg-Honor-dmesg_restrict-sysctl-on-dev-kmsg.patch
+#rhbz 914737
+Patch21262: x86-mm-Fix-vmalloc_fault-oops-during-lazy-MMU-updates.patch
+
Patch22000: weird-root-dentry-name-debug.patch
#selinux ptrace child permissions
@@ -1441,6 +1444,9 @@ ApplyPatch sock_diag-Fix-out-of-bounds-access-to-sock_diag_handlers.patch
#rhbz 903192
ApplyPatch 0001-kmsg-Honor-dmesg_restrict-sysctl-on-dev-kmsg.patch
+#rhbz 914737
+ApplyPatch x86-mm-Fix-vmalloc_fault-oops-during-lazy-MMU-updates.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2296,6 +2302,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Feb 26 2013 Josh Boyer <jwboyer@redhat.com>
+- Fix vmalloc_fault oops during lazy MMU (rhbz 914737)
+
* Mon Feb 25 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git7.1
- Honor dmesg_restrict for /dev/kmsg (rhbz 903192)
- Linux v3.8-7888-gab78265