diff options
author | Kyle McMartin <kyle@redhat.com> | 2010-12-02 11:57:44 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@redhat.com> | 2010-12-02 11:57:44 -0500 |
commit | 254585788fce648441c41bf2854ac0899f3e2b1a (patch) | |
tree | 721f31cb7920dd3c1a3e116d0f4dfef24e88d7d1 /kernel.spec | |
parent | 8077b629b4f8dedcaafadce6fc40e50de6e1f920 (diff) | |
download | kernel-254585788fce648441c41bf2854ac0899f3e2b1a.tar.gz kernel-254585788fce648441c41bf2854ac0899f3e2b1a.tar.xz kernel-254585788fce648441c41bf2854ac0899f3e2b1a.zip |
kswapd fixes from mmotm
(queuing them here since it's unclear if they'll go into .37 or wait for
.38)
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index b01ba32a2..473b6e29d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -705,6 +705,9 @@ Patch12401: debug-tty-print-dev-name.patch Patch12402: tty-ldisc-fix-open-flag-handling.patch Patch12403: tty-open-hangup-race-fixup.patch +Patch12410: mm-page-allocator-adjust-the-per-cpu-counter-threshold-when-memory-is-low.patch +Patch12411: mm-vmstat-use-a-single-setter-function-and-callback-for-adjusting-percpu-thresholds.patch + %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1300,6 +1303,10 @@ ApplyPatch debug-tty-print-dev-name.patch ApplyPatch tty-ldisc-fix-open-flag-handling.patch ApplyPatch tty-open-hangup-race-fixup.patch +# backport some fixes for kswapd from mmotm, rhbz#649694 +ApplyPatch mm-page-allocator-adjust-the-per-cpu-counter-threshold-when-memory-is-low.patch +ApplyPatch mm-vmstat-use-a-single-setter-function-and-callback-for-adjusting-percpu-thresholds.patch + # END OF PATCH APPLICATIONS %endif @@ -1912,6 +1919,9 @@ fi # || || %changelog +* Thu Dec 02 2010 Kyle McMartin <kyle@redhat.com> +- Grab some of Mel's fixes from -mmotm to hopefully sort out #649694. + * Wed Dec 01 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.rc4.git1.1 - Linux 2.6.37-rc4-git1 - Pull in DRM fixes that are queued for -rc5 [3074adc8] |