From: Nick Xie <nick@khadas.com>
Date: Sat, 7 Nov 2020 02:30:00 +0000 (+0800)
Subject: Merge tag 'v4.9.239' into khadas-vims-4.9.y
X-Git-Tag: khadas-vims-v0.9.6-release~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d23f31cfa7a413bbfb0dd36e864178bde18cfdf8;p=platform%2Fkernel%2Flinux-amlogic.git

Merge tag 'v4.9.239' into khadas-vims-4.9.y

This is the 4.9.239 stable release

Signed-off-by: Nick Xie <nick@khadas.com>
---

d23f31cfa7a413bbfb0dd36e864178bde18cfdf8
diff --cc mm/page_alloc.c
index 5a6587215033,b0c451e3b59f..e3e9dd354aa1
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@@ -64,9 -64,7 +64,10 @@@
  #include <linux/page_owner.h>
  #include <linux/kthread.h>
  #include <linux/memcontrol.h>
 +#ifdef CONFIG_AMLOGIC_PAGE_TRACE
 +#include <linux/amlogic/page_trace.h>
 +#endif /* CONFIG_AMLOGIC_PAGE_TRACE */
+ #include <linux/khugepaged.h>
  
  #include <asm/sections.h>
  #include <asm/tlbflush.h>