summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-10-17 13:24:14 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-10-17 13:33:12 -0400
commit922059227ce012ccb60adaefee0e4237f46bee46 (patch)
tree99295a600ddb32a7b65f972a1de3add965727128 /kernel.spec
parent3e1637b65790f195c6936e5b4e443c5ca9f37ed4 (diff)
downloadkernel-922059227ce012ccb60adaefee0e4237f46bee46.tar.gz
kernel-922059227ce012ccb60adaefee0e4237f46bee46.tar.xz
kernel-922059227ce012ccb60adaefee0e4237f46bee46.zip
Add two patches to fix stalls in khugepaged (rhbz 735946)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec11
1 files changed, 11 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 9d8f2118d..ced743b4d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -741,6 +741,10 @@ Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.patch
#rhbz #722509
Patch21002: mmc-Always-check-for-lower-base-frequency-quirk-for-.patch
+#rhbz #735946
+Patch21020: 0001-mm-vmscan-Limit-direct-reclaim-for-higher-order-allo.patch
+Patch21021: 0002-mm-Abort-reclaim-compaction-if-compaction-can-procee.patch
+
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1358,6 +1362,10 @@ ApplyPatch mmc-Always-check-for-lower-base-frequency-quirk-for-.patch
# utrace.
ApplyPatch utrace.patch
+#rhbz #735946
+ApplyPatch 0001-mm-vmscan-Limit-direct-reclaim-for-higher-order-allo.patch
+ApplyPatch 0002-mm-Abort-reclaim-compaction-if-compaction-can-procee.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2066,6 +2074,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Oct 17 2011 Josh Boyer <jwboyer@redhat.com>
+- Add two patches to fix stalls in khugepaged (rhbz 735946)
+
* Fri Oct 14 2011 Dave Jones <davej@redhat.com>
- Disable CONFIG_ACPI_PROCFS_POWER which is supposed to be going away soon.