commit:     adba88cd57526f2f189fb86125bca5bfd9af3801
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 14:46:26 2016 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 14:46:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=adba88cd

Revert commit 8f182270dfec mm/swap.c: flush lru pvecs on compound page arrival 
to fix OOM error.

 0000_README                                 |  4 ++++
 1800_fix-lru-cache-add-oom-regression.patch | 17 +++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/0000_README b/0000_README
index 1863a89..35319e8 100644
--- a/0000_README
+++ b/0000_README
@@ -207,6 +207,10 @@ Patch:  2700_ThinkPad-30-brightness-control-fix.patch
 From:   Seth Forshee <seth.fors...@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 0000000..f1ca64b
--- /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);
+ }

Reply via email to