Skip to content
Permalink
Browse files

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

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

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
  • Loading branch information...
Charles E. Youse authored and nashif committed Jun 29, 2019
1 parent 39cd2eb commit 7c2d7d7b692e121738bf78b00d7dc55c1a64b233
@@ -20,7 +20,7 @@
#include <linker/sections.h>
#include <kernel_structs.h>
#include <wait_q.h>
#include <mmustructs.h>
#include <ia32/mmustructs.h>
#include <sys/printk.h>

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

#include <kernel_structs.h>
#include <swapstk.h>
#include <mmustructs.h>
#include <ia32/mmustructs.h>
#include <arch/x86/multiboot.h>

#include <kernel_offsets.h>
@@ -5,8 +5,8 @@
* SPDX-License-Identifier: Apache-2.0
*/

#ifndef ZEPHYR_ARCH_X86_INCLUDE_MMUSTRUCTS_H_
#define ZEPHYR_ARCH_X86_INCLUDE_MMUSTRUCTS_H_
#ifndef ZEPHYR_ARCH_X86_INCLUDE_IA32_MMUSTRUCTS_H_
#define ZEPHYR_ARCH_X86_INCLUDE_IA32_MMUSTRUCTS_H_

#define MMU_PAGE_SIZE 4096U
#define MMU_PAGE_MASK 0xfffU
@@ -500,4 +500,4 @@ struct x86_mmu_pt {

#endif /* _ASMLANGUAGE */

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

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

#ifdef CONFIG_X86_MMU
@@ -21,7 +21,7 @@
#include <drivers/uart.h>
#include <init.h>
#include "shared_mem.h"
#include <mmustructs.h>
#include <ia32/mmustructs.h>

#define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
#include <logging/log.h>
@@ -6,7 +6,7 @@

#include <zephyr.h>
#include <sys/printk.h>
#include <mmustructs.h>
#include <ia32/mmustructs.h>
#include <ztest.h>
#include "boot_page_table.h"

@@ -6,7 +6,7 @@

#include <zephyr.h>
#include <sys/printk.h>
#include <mmustructs.h>
#include <ia32/mmustructs.h>
#include <arch/x86/ia32/arch.h>
#include <linker/linker-defs.h>
#include <ztest.h>

0 comments on commit 7c2d7d7

Please sign in to comment.
You can’t perform that action at this time.