mm: fix build error for memory optimization. [1/1]

PD#SWPL-188274

Problem:
fix build failed problem.

Solution:
fix build failed problem.

Verify:
local.

Change-Id: Id37ab5fe80d21e63cd759f84c7ebb0067b0492ee
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>

auto_patch/common14-5.15/common/04_memory/0016-mm-add-memory-optimization.-1-1.patch

@@ -1,4 +1,4 @@
-From 83e064e3d44056ea2b132361887aaf206ab9c94c Mon Sep 17 00:00:00 2001
+From 8a09ee012fb3ce98d03f7d6f3ee9f9303b32a94e Mon Sep 17 00:00:00 2001
 From: Jianxiong Pan <jianxiong.pan@amlogic.com>
 Date: Tue, 20 Jun 2023 19:32:11 +0800
 Subject: [PATCH] mm: add memory optimization. [1/1]
@@ -48,7 +48,7 @@ index 741d7c3bcba5..de133a6c7820 100644
  	}
  
 diff --git a/drivers/of/base.c b/drivers/of/base.c
-index 54719f8156ed..95e8c18a4a24 100644
+index bc5abe650c5c..e46a0750c827 100644
 --- a/drivers/of/base.c
 +++ b/drivers/of/base.c
 @@ -166,8 +166,9 @@ void __of_phandle_cache_inv_entry(phandle handle)
@@ -77,10 +77,10 @@ index 54719f8156ed..95e8c18a4a24 100644
  
  	/* Symlink in /proc as required by userspace ABI */
 diff --git a/include/linux/android_kabi.h b/include/linux/android_kabi.h
-index f6dd7f00b386..ee6b29e8d796 100644
+index 1fa329ee4d73..1671fc1e1cc2 100644
 --- a/include/linux/android_kabi.h
 +++ b/include/linux/android_kabi.h
-@@ -83,12 +83,15 @@
+@@ -84,12 +84,15 @@
   *   number: the "number" of the padding variable in the structure.  Start with
   *   1 and go up.
   */
@@ -173,14 +173,14 @@ index 559eff84a620..dfe427268949 100644
  EXPORT_SYMBOL(init_task);
  
 diff --git a/kernel/Makefile b/kernel/Makefile
-index 2e0dac3da346..7669ad1dc1c0 100644
+index 2e0dac3da346..a19d231f0fba 100644
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
 @@ -81,7 +81,9 @@ obj-$(CONFIG_UTS_NS) += utsname.o
  obj-$(CONFIG_USER_NS) += user_namespace.o
  obj-$(CONFIG_PID_NS) += pid_namespace.o
  obj-$(CONFIG_IKCONFIG) += configs.o
-+ifndef CONFIG_AMLOGIC_MEMORY_OPT
++ifndef CONFIG_AMLOGIC_KHEADERS_OPT
  obj-$(CONFIG_IKHEADERS) += kheaders.o
 +endif
  obj-$(CONFIG_SMP) += stop_machine.o
@@ -220,7 +220,7 @@ index d8b26077824c..993e24f06f1d 100644
  	trace_android_vh_dup_task_struct(tsk, orig);
  	return tsk;
 diff --git a/kernel/module.c b/kernel/module.c
-index f99e733f451a..2995dd5e4bd9 100644
+index 658571891a10..37bdb9ebec50 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
 @@ -2743,15 +2743,21 @@ static bool is_core_symbol(const Elf_Sym *src, const Elf_Shdr *sechdrs,

drivers/amfc/aml_erofs/utils.c

@@ -362,14 +362,22 @@ static struct ksymbol module_symbols[] = {
 	KSYM_FUN(iomap_bmap),
 	KSYM_FUN(iomap_readahead),
 	KSYM_FUN(iomap_readpage),
+#ifdef CONFIG_CFI_CLANG
 	KSYM_CFI(generic_file_readonly_mmap),
 	KSYM_CFI(noop_direct_IO),
-	KSYM_FUN(iomap_fiemap),
-	KSYM_FUN(read_cache_page_gfp),
 	KSYM_CFI(simple_get_link),
 	KSYM_CFI(page_get_link),
-	KSYM_FUN(crc32c),
 	KSYM_CFI(fs_param_is_enum),
+#else
+	KSYM_FUN(generic_file_readonly_mmap),
+	KSYM_FUN(noop_direct_IO),
+	KSYM_FUN(simple_get_link),
+	KSYM_FUN(page_get_link),
+	KSYM_FUN(fs_param_is_enum),
+#endif
+	KSYM_FUN(iomap_fiemap),
+	KSYM_FUN(read_cache_page_gfp),
+	KSYM_FUN(crc32c),
 	KSYM_FUN(add_to_page_cache_lru),
 	KSYM_FUN(readahead_expand),
 	KSYM_FUN(kthread_create_worker_on_cpu),

drivers/media/enhancement/amvecm/amcsc.c

@@ -7331,8 +7331,9 @@ static void hdr_support_process(struct vinfo_s *vinfo,
 			 (get_cpu_type() == MESON_CPU_MAJOR_ID_TXL))) {
 			/*tv sdr->hdr*/
 			sdr_process_mode[vd_path] = PROC_SDR_TO_HDR;
+		}
 #endif
-		} else {
+		else {
 			/* sdr->sdr*/
 			sdr_process_mode[vd_path] = PROC_BYPASS;
 		}

drivers/media/vout/lcd/lcd_clk/lcd_clk_tl1_tm2.c

@@ -678,12 +678,14 @@ static struct lcd_clk_data_s lcd_clk_data_tm2 = {
 	.prbs_test = lcd_clk_prbs_test,
 };
 
+#ifndef CONFIG_AMLOGIC_REMOVE_OLD
 void lcd_clk_config_chip_init_tl1(struct aml_lcd_drv_s *pdrv, struct lcd_clk_config_s *cconf)
 {
 	cconf->data = &lcd_clk_data_tl1;
 	cconf->pll_od_fb = lcd_clk_data_tl1.pll_od_fb;
 	cconf->clk_path_change = NULL;
 }
+#endif
 
 void lcd_clk_config_chip_init_tm2(struct aml_lcd_drv_s *pdrv, struct lcd_clk_config_s *cconf)
 {

drivers/memory_ext/Kconfig

@@ -133,7 +133,6 @@ config AMLOGIC_CMA_DIS
 
 config AMLOGIC_MEMORY_OPT
 	bool "Amlogic memory optimization support"
-	depends on AMLOGIC_BREAK_GKI
 	depends on AMLOGIC_MEMORY_EXTEND
 	default n
 	help
@@ -190,3 +189,30 @@ config AMLOGIC_ARM_KASAN
 	help
 		Support enable kasan on arm32
 
+config AMLOGIC_DTB_NODE_OPT
+	bool "remove dtb node optimization"
+	default n
+	help
+		some project to optimize the slab size, remove the
+		dtb node under /sys/firmware/devicetree directory.
+
+config AMLOGIC_KALLSYM_OPT
+	bool "kallsyms optimization"
+	default n
+	help
+		some project to optimize the kallsyms.
+
+config AMLOGIC_PRINTK_OPT
+	bool "printk optimization"
+	default n
+	help
+		some project to optimize the printk, reduce the
+		log buffer size.
+
+config AMLOGIC_KHEADERS_OPT
+	bool "kheaders optimization"
+	default n
+	help
+		some project to remove the kheaders, reduce the
+		kernel image size.
+