michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: x86: pagetables: pass if userspace disabled

Browse source 
_app_smem doesn't exist in this case.

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2020-12-16 20:08:26 -08:00 • committed by Anas Nashif
commit 898621a1b4
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/arch/x86/pagetables/src/main.c
View file

@ -101,7 +101,8 @@ void test_ram_perms(void)
expected = MMU_P | MMU_XD; expected = MMU_P | MMU_XD;
} }
#endif /* CONFIG_X86_64 */ #endif /* CONFIG_X86_64 */
#if !defined(CONFIG_X86_KPTI) && !defined(CONFIG_X86_COMMON_PAGE_TABLE) #if !defined(CONFIG_X86_KPTI) && !defined(CONFIG_X86_COMMON_PAGE_TABLE) && \
defined(CONFIG_USERSPACE)
} else if (IN_REGION(_app_smem, pos)) { } else if (IN_REGION(_app_smem, pos)) {
/* If KPTI is not enabled, then the default memory /* If KPTI is not enabled, then the default memory
* domain affects our page tables even though we are * domain affects our page tables even though we are
@ -155,11 +156,13 @@ void z_impl_dump_my_ptables(void)
z_x86_dump_page_tables(z_x86_thread_page_tables_get(cur)); z_x86_dump_page_tables(z_x86_thread_page_tables_get(cur));
} }
#ifdef CONFIG_USERSPACE
void z_vrfy_dump_my_ptables(void) void z_vrfy_dump_my_ptables(void)
{ {
z_impl_dump_my_ptables(); z_impl_dump_my_ptables();
} }
#include <syscalls/dump_my_ptables_mrsh.c> #include <syscalls/dump_my_ptables_mrsh.c>
#endif /* CONFIG_USERSPACE */
/** /**
* Dump kernel's page tables to console * Dump kernel's page tables to console