You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2023/06/05 09:03:46 UTC

[nuttx] branch master updated: kmm/kmm_map: Add missing FAR qualifiers

This is an automated email from the ASF dual-hosted git repository.

pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new a41f752ecc kmm/kmm_map: Add missing FAR qualifiers
a41f752ecc is described below

commit a41f752ecc2b8a73d81248fa04c3ed43d2445411
Author: Ville Juven <vi...@unikie.com>
AuthorDate: Mon Jun 5 09:26:12 2023 +0300

    kmm/kmm_map: Add missing FAR qualifiers
---
 arch/risc-v/src/common/riscv_addrenv_pgmap.c | 2 +-
 include/nuttx/mm/kmap.h                      | 6 +++---
 mm/kmap/kmm_map.c                            | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/risc-v/src/common/riscv_addrenv_pgmap.c b/arch/risc-v/src/common/riscv_addrenv_pgmap.c
index b0eac5726e..9dbac8592f 100644
--- a/arch/risc-v/src/common/riscv_addrenv_pgmap.c
+++ b/arch/risc-v/src/common/riscv_addrenv_pgmap.c
@@ -59,7 +59,7 @@
  *
  ****************************************************************************/
 
-uintptr_t up_addrenv_find_page(FAR arch_addrenv_t *addrenv, uintptr_t vaddr)
+uintptr_t up_addrenv_find_page(arch_addrenv_t *addrenv, uintptr_t vaddr)
 {
   uintptr_t pgdir;
   uintptr_t lnvaddr;
diff --git a/include/nuttx/mm/kmap.h b/include/nuttx/mm/kmap.h
index 00a536fbe8..f81536352a 100644
--- a/include/nuttx/mm/kmap.h
+++ b/include/nuttx/mm/kmap.h
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_MM_KMAP_H_
-#define __INCLUDE_NUTTX_MM_KMAP_H_
+#ifndef __INCLUDE_NUTTX_MM_KMAP_H
+#define __INCLUDE_NUTTX_MM_KMAP_H
 
 /****************************************************************************
  * Name: kmm_map_initialize
@@ -106,4 +106,4 @@ FAR void *kmm_user_map(FAR void *uaddr, size_t size);
 
 FAR void *kmm_map_user_page(FAR void *uaddr);
 
-#endif /* __INCLUDE_NUTTX_MM_KMAP_H_ */
+#endif /* __INCLUDE_NUTTX_MM_KMAP_H */
diff --git a/mm/kmap/kmm_map.c b/mm/kmap/kmm_map.c
index 4c47ad2f70..883b019c44 100644
--- a/mm/kmap/kmm_map.c
+++ b/mm/kmap/kmm_map.c
@@ -112,7 +112,7 @@ static int get_user_pages(FAR void **pages, size_t npages, uintptr_t vaddr)
  *
  ****************************************************************************/
 
-static void *map_pages(FAR void **pages, size_t npages, int prot)
+static FAR void *map_pages(FAR void **pages, size_t npages, int prot)
 {
   struct mm_map_entry_s entry;
   FAR void             *vaddr;
@@ -175,7 +175,7 @@ errout_with_vaddr:
  *
  ****************************************************************************/
 
-static void *map_single_user_page(uintptr_t vaddr)
+static FAR void *map_single_user_page(uintptr_t vaddr)
 {
   FAR struct tcb_s *tcb = nxsched_self();
   uintptr_t         page;
@@ -385,7 +385,7 @@ FAR void *kmm_user_map(FAR void *uaddr, size_t size)
 
   /* No, the area must be mapped into kernel virtual address space */
 
-  pages = kmm_zalloc(npages * sizeof(void *));
+  pages = kmm_zalloc(npages * sizeof(FAR void *));
   if (!pages)
     {
       return NULL;