From 36eb117140bc0112b8dae8de2ffffa7773088548 Mon Sep 17 00:00:00 2001
From: zhangfanfan2 <zhangfanfan2@huawei.com>
Date: Sat, 13 Mar 2021 19:05:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=A7=A3=E8=80=A6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9---=E6=94=AF=E6=8C=81=E5=86=85=E6=A0=B8=E6=80=81dynloa?=
 =?UTF-8?q?d=E5=92=8Cnet=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 arch/arm/arm/src/los_exc.c | 4 ++++
 syscall/fs_syscall.c       | 4 ++++
 syscall/los_syscall.h      | 2 ++
 syscall/net_syscall.c      | 2 +-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/arch/arm/arm/src/los_exc.c b/arch/arm/arm/src/los_exc.c
index de57d93c..73e179d9 100755
--- a/arch/arm/arm/src/los_exc.c
+++ b/arch/arm/arm/src/los_exc.c
@@ -55,7 +55,9 @@
 #include "los_vm_phys.h"
 #include "los_vm_fault.h"
 #include "los_vm_common.h"
+#ifdef LOSCFG_KERNEL_DYNLOAD
 #include "los_load_elf.h"
+#endif
 #include "arm.h"
 #include "los_bitmap.h"
 #include "los_process_pri.h"
@@ -283,9 +285,11 @@ STATIC VADDR_T OsGetTextRegionBase(LosVmMapRegion *region, LosProcessCB *runProc
     } while (!strcmp(curFilep->f_path, lastFilep->f_path));
 
 DONE:
+#ifdef LOSCFG_KERNEL_DYNLOAD
     if (curRegion->range.base == EXEC_MMAP_BASE) {
         return 0;
     }
+#endif
     return curRegion->range.base;
 }
 
diff --git a/syscall/fs_syscall.c b/syscall/fs_syscall.c
index c1b8c790..72ad0653 100755
--- a/syscall/fs_syscall.c
+++ b/syscall/fs_syscall.c
@@ -43,7 +43,9 @@
 #include "sys/uio.h"
 #include "poll.h"
 #include "sys/prctl.h"
+#ifdef LOSCFG_KERNEL_DYNLOAD
 #include "los_exec_elf.h"
+#endif
 #include "los_syscall.h"
 #include "dirent.h"
 #include "user_copy.h"
@@ -380,10 +382,12 @@ OUT:
     return ret;
 }
 
+#ifdef LOSCFG_KERNEL_DYNLOAD
 int SysExecve(const char *fileName, char *const *argv, char *const *envp)
 {
     return LOS_DoExecveFile(fileName, argv, envp);
 }
+#endif
 
 int SysChdir(const char *path)
 {
diff --git a/syscall/los_syscall.h b/syscall/los_syscall.h
index 0827b0a6..a4e04f43 100755
--- a/syscall/los_syscall.h
+++ b/syscall/los_syscall.h
@@ -35,6 +35,7 @@
 #include "los_typedef.h"
 #include "los_task.h"
 #include "los_mux.h"
+#include "los_signal.h"
 #include "fs/fs.h"
 #include "syscall.h"
 #ifdef LOSCFG_KERNEL_DYNLOAD
@@ -52,6 +53,7 @@
 #ifdef LOSCFG_FS_VFS
 #include "sys/socket.h"
 #include "dirent.h"
+#include "fs/fs.h"
 #endif
 
 /* process */
diff --git a/syscall/net_syscall.c b/syscall/net_syscall.c
index 1532eb12..6abc6d09 100755
--- a/syscall/net_syscall.c
+++ b/syscall/net_syscall.c
@@ -37,10 +37,10 @@
 #include "los_signal.h"
 #include "los_syscall.h"
 #include "los_vm_map.h"
-#include "lwip/sockets.h"
 #include "user_copy.h"
 
 #ifdef LOSCFG_NET_LWIP_SACK
+#include "lwip/sockets.h"
 
 #define SOCKET_U2K(s) \
     do { \
-- 
GitLab