diff options
author | Mike Pagano <mpagano@gentoo.org> | 2016-07-15 10:46:26 -0400 |
---|---|---|
committer | Mike Pagano <mpagano@gentoo.org> | 2016-07-15 10:46:26 -0400 |
commit | adba88cd57526f2f189fb86125bca5bfd9af3801 (patch) | |
tree | a5abafdcc7071f391e5d23269b04377afb466f9e | |
parent | Linux patch 3.18.37 (diff) | |
download | linux-patches-adba88cd57526f2f189fb86125bca5bfd9af3801.tar.gz linux-patches-adba88cd57526f2f189fb86125bca5bfd9af3801.tar.bz2 linux-patches-adba88cd57526f2f189fb86125bca5bfd9af3801.zip |
Revert commit 8f182270dfec mm/swap.c: flush lru pvecs on compound page arrival to fix OOM error.
-rw-r--r-- | 0000_README | 4 | ||||
-rw-r--r-- | 1800_fix-lru-cache-add-oom-regression.patch | 17 |
2 files changed, 21 insertions, 0 deletions
diff --git a/0000_README b/0000_README index 1863a892..35319e88 100644 --- a/0000_README +++ b/0000_README @@ -207,6 +207,10 @@ Patch: 2700_ThinkPad-30-brightness-control-fix.patch From: Seth Forshee <seth.forshee@canonical.com> Desc: ACPI: Disable Windows 8 compatibility for some Lenovo ThinkPads. +Patch: 1800_fix-lru-cache-add-oom-regression.patch +From: http://thread.gmane.org/gmane.linux.kernel.stable/184384 +Desc: Revert commit 8f182270dfec mm/swap.c: flush lru pvecs on compound page arrival to fix OOM error. + Patch: 2900_dev-root-proc-mount-fix.patch From: https://bugs.gentoo.org/show_bug.cgi?id=438380 Desc: Ensure that /dev/root doesn't appear in /proc/mounts when bootint without an initramfs. diff --git a/1800_fix-lru-cache-add-oom-regression.patch b/1800_fix-lru-cache-add-oom-regression.patch new file mode 100644 index 00000000..f1ca64b0 --- /dev/null +++ b/1800_fix-lru-cache-add-oom-regression.patch @@ -0,0 +1,17 @@ +Revert commit 8f182270dfec mm/swap.c: flush lru pvecs on compound page arrival to fix OOM error. + +Signed-off-by: Steven Rostedt <rostedt <at> goodmis.org> +--- +diff --git a/mm/swap.c b/mm/swap.c +index b523f0a4cbfb..ab3b9c2dd783 100644 +--- a/mm/swap.c ++++ b/mm/swap.c + <at> <at> -631,7 +631,7 <at> <at> static void __lru_cache_add(struct page *page) + struct pagevec *pvec = &get_cpu_var(lru_add_pvec); + + page_cache_get(page); +- if (!pagevec_space(pvec) || PageCompound(page)) ++ if (!pagevec_add(pvec, page) || PageCompound(page)) + __pagevec_lru_add(pvec); + put_cpu_var(lru_add_pvec); + } |