mm: move the config to meet the gki request. [3/3]

PD#SWPL-94445

Problem:
gki break.

Solution:
move the config to meet the gki request.

Verify:
build pass.

Change-Id: I6b878a5d8fc10317634143b815a69b2206753033
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>
This commit is contained in:
Jianxiong Pan
2022-09-15 15:33:03 +08:00
parent 9c3f8bf29a
commit c1916ee5d3
6 changed files with 32 additions and 29 deletions
+26 -1
View File
@@ -7,4 +7,29 @@ CONFIG_AMLOGIC_SERIAL_EARLY_CONSOLE=y
CONFIG_I2C_COMPAT=y
# usb xxx ko
CONFIG_AMLOGIC_COMMON_USB=y
CONFIG_AMLOGIC_COMMON_USB=y
# build in for amlogic memory change
CONFIG_CMA_SIZE_MBYTES=8
CONFIG_AMLOGIC_MEMORY_EXTEND=y
CONFIG_AMLOGIC_MEM_DEBUG=y
CONFIG_AMLOGIC_CMA=y
CONFIG_AMLOGIC_PAGE_TRACE=y
CONFIG_AMLOGIC_SLAB_TRACE=y
CONFIG_AMLOGIC_FILE_CACHE=y
CONFIG_AMLOGIC_STACKPROTECTOR=y
CONFIG_AMLOGIC_USER_FAULT=y
CONFIG_AMLOGIC_WATCHPOINT=y
CONFIG_HAVE_HW_BREAKPOINT=y
CONFIG_DMABUF_HEAPS_SYSTEM=m
CONFIG_AMLOGIC_ZSTD=y
# amlogic-ddr-tool.ko
CONFIG_AMLOGIC_DDR_TOOL=y
CONFIG_AMLOGIC_DDR_BANDWIDTH=y
CONFIG_AMLOGIC_DDR_BANDWIDTH_S4=y
CONFIG_AMLOGIC_DDR_BANDWIDTH_G12=y
CONFIG_AMLOGIC_DMC_MONITOR=y
CONFIG_AMLOGIC_DMC_MONITOR_S4=y
CONFIG_AMLOGIC_DMC_MONITOR_TM2=y
CONFIG_AMLOGIC_DMC_MONITOR_G12=y
+1 -23
View File
@@ -8,20 +8,8 @@ CONFIG_AMLOGIC_DEBUG_FILE=y
# ONFIG_AMLOGIC_SAMPLES_DEBUG_FILE_TEST=m
# build in for amlogic memory change
CONFIG_CMA_SIZE_MBYTES=8
CONFIG_AMLOGIC_MEMORY_EXTEND=y
CONFIG_AMLOGIC_PAGE_TRACE=y
CONFIG_AMLOGIC_SLAB_TRACE=y
CONFIG_AMLOGIC_CMA=y
CONFIG_AMLOGIC_VMAP=y
CONFIG_AMLOGIC_MEM_DEBUG=y
CONFIG_AMLOGIC_FILE_CACHE=y
CONFIG_AMLOGIC_STACKPROTECTOR=y
CONFIG_AMLOGIC_USER_FAULT=y
CONFIG_AMLOGIC_WATCHPOINT=y
CONFIG_HAVE_HW_BREAKPOINT=y
CONFIG_AMLOGIC_ZSTD=y
CONFIG_DMA_RESTRICTED_POOL=n
CONIFG_AMLOGIC_MEMORY_STAT=y
CONFIG_INIT_ON_ALLOC_DEFAULT_ON=n
CONFIG_SPECULATIVE_PAGE_FAULT=n
@@ -40,13 +28,3 @@ CONFIG_AMLOGIC_DEBUG_RELABEL_GKI=n
#cfg80211.ko
CONFIG_NL80211_TESTMODE=y
CONFIG_CFG80211_WEXT=y
# amlogic-ddr-tool.ko
CONFIG_AMLOGIC_DDR_TOOL=y
CONFIG_AMLOGIC_DDR_BANDWIDTH=y
CONFIG_AMLOGIC_DDR_BANDWIDTH_S4=y
CONFIG_AMLOGIC_DDR_BANDWIDTH_G12=y
CONFIG_AMLOGIC_DMC_MONITOR=y
CONFIG_AMLOGIC_DMC_MONITOR_S4=y
CONFIG_AMLOGIC_DMC_MONITOR_TM2=y
CONFIG_AMLOGIC_DMC_MONITOR_G12=y
+1 -1
View File
@@ -27,7 +27,7 @@ config AMLOGIC_PAGE_TRACE_INLINE
depends on AMLOGIC_PAGE_TRACE
depends on 64BIT
depends on !KASAN_HW_TAGS && !KASAN_SW_TAGS
default y
default n
help
This feature enable to inline page trace into high 32bits of
page->flags on 64 bit kernel. Because other total page flags
+3
View File
@@ -24,6 +24,9 @@
#include <asm/fixmap.h>
#include <linux/kasan.h>
#include <linux/seq_file.h>
#ifdef CONFIG_HIGHMEM
#include <asm/highmem.h>
#endif
#ifdef CONFIG_AMLOGIC_CMA
#include <linux/amlogic/aml_cma.h>
#endif
+1 -1
View File
@@ -21,9 +21,9 @@
#include <linux/slab.h>
#include <linux/amlogic/aml_cma.h>
#include <../../../mm/internal.h>
#include <linux/kmemleak.h>
#ifdef CONFIG_AMLOGIC_PAGE_TRACE
#include <linux/amlogic/page_trace.h>
#include <linux/kmemleak.h>
#include <linux/kasan.h>
#endif
-3
View File
@@ -6,9 +6,6 @@
#ifndef __AMLOGIC_CMA_H__
#define __AMLOGIC_CMA_H__
#include <linux/migrate_mode.h>
#include <linux/pagemap.h>
#ifdef CONFIG_AMLOGIC_CMA
#define GFP_NO_CMA (__GFP_NO_CMA | __GFP_WRITE)
static inline bool cma_forbidden_mask(gfp_t gfp_flags)