michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch/x86: move arch/x86/include/mmustructs.h to ia32/mmustructs.h

Browse source 
For now, only the 32-bit subarchitecture supports memory protection.

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
This commit is contained in:
Charles E. Youse 2019-06-29 11:00:39 -07:00 • committed by Anas Nashif
commit 7c2d7d7b69
9 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/core/ia32/thread.c
View file

@ -20,7 +20,7 @@
#include <linker/sections.h> #include <linker/sections.h>
#include <kernel_structs.h> #include <kernel_structs.h>
#include <wait_q.h> #include <wait_q.h>
#include <mmustructs.h> #include <ia32/mmustructs.h>
#include <sys/printk.h> #include <sys/printk.h>
/* forward declaration */ /* forward declaration */

2
arch/x86/core/ia32/x86_mmu.c
View file

@ -5,7 +5,7 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#include <kernel.h> #include <kernel.h>
#include <mmustructs.h> #include <ia32/mmustructs.h>
#include <linker/linker-defs.h> #include <linker/linker-defs.h>
#include <kernel_internal.h> #include <kernel_internal.h>
#include <init.h> #include <init.h>

2
arch/x86/core/offsets/offsets.c
View file

@ -28,7 +28,7 @@
#include <kernel_structs.h> #include <kernel_structs.h>
#include <swapstk.h> #include <swapstk.h>
#include <mmustructs.h> #include <ia32/mmustructs.h>
#include <arch/x86/multiboot.h> #include <arch/x86/multiboot.h>
#include <kernel_offsets.h> #include <kernel_offsets.h>

6
arch/x86/include/mmustructs.h → arch/x86/include/ia32/mmustructs.h
View file

@ -5,8 +5,8 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#ifndef ZEPHYR_ARCH_X86_INCLUDE_MMUSTRUCTS_H_ #ifndef ZEPHYR_ARCH_X86_INCLUDE_IA32_MMUSTRUCTS_H_
#define ZEPHYR_ARCH_X86_INCLUDE_MMUSTRUCTS_H_ #define ZEPHYR_ARCH_X86_INCLUDE_IA32_MMUSTRUCTS_H_
#define MMU_PAGE_SIZE 4096U #define MMU_PAGE_SIZE 4096U
#define MMU_PAGE_MASK 0xfffU #define MMU_PAGE_MASK 0xfffU
@ -500,4 +500,4 @@ struct x86_mmu_pt {
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_ARCH_X86_INCLUDE_MMUSTRUCTS_H_ */ #endif /* ZEPHYR_ARCH_X86_INCLUDE_IA32_MMUSTRUCTS_H_ */

2
include/arch/x86/ia32/arch.h
View file

@ -19,7 +19,7 @@
#include <drivers/interrupt_controller/sysapic.h> #include <drivers/interrupt_controller/sysapic.h>
#include <kernel_arch_thread.h> #include <kernel_arch_thread.h>
#include <generated_dts_board.h> #include <generated_dts_board.h>
#include <mmustructs.h> #include <ia32/mmustructs.h>
#include <stdbool.h> #include <stdbool.h>
#include <arch/common/ffs.h> #include <arch/common/ffs.h>

2
soc/x86/ia32/soc.c
View file

@ -17,7 +17,7 @@
#include <drivers/uart.h> #include <drivers/uart.h>
#include <device.h> #include <device.h>
#include <init.h> #include <init.h>
#include <mmustructs.h> #include <ia32/mmustructs.h>
#include <linker/linker-defs.h> #include <linker/linker-defs.h>
#ifdef CONFIG_X86_MMU #ifdef CONFIG_X86_MMU

2
soc/x86/intel_quark/quark_se/soc.c
View file

@ -21,7 +21,7 @@
#include <drivers/uart.h> #include <drivers/uart.h>
#include <init.h> #include <init.h>
#include "shared_mem.h" #include "shared_mem.h"
#include <mmustructs.h> #include <ia32/mmustructs.h>
#define LOG_LEVEL CONFIG_SOC_LOG_LEVEL #define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
#include <logging/log.h> #include <logging/log.h>

2
tests/kernel/boot_page_table/src/boot_page_table.c
View file

@ -6,7 +6,7 @@
#include <zephyr.h> #include <zephyr.h>
#include <sys/printk.h> #include <sys/printk.h>
#include <mmustructs.h> #include <ia32/mmustructs.h>
#include <ztest.h> #include <ztest.h>
#include "boot_page_table.h" #include "boot_page_table.h"

2
tests/kernel/mem_protect/x86_mmu_api/src/userbuffer_validate.c
View file

@ -6,7 +6,7 @@
#include <zephyr.h> #include <zephyr.h>
#include <sys/printk.h> #include <sys/printk.h>
#include <mmustructs.h> #include <ia32/mmustructs.h>
#include <arch/x86/ia32/arch.h> #include <arch/x86/ia32/arch.h>
#include <linker/linker-defs.h> #include <linker/linker-defs.h>
#include <ztest.h> #include <ztest.h>