x86: move mmustructs.h

This will be used for both 32-bit and 64-bit mode.
This header gets pulled in by x86's arch/cpu.h, so put
it in include/arch/x86/.

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2019-10-07 14:13:12 -07:00 committed by Andrew Boie
commit e3ab43580c
9 changed files with 11 additions and 11 deletions

View file

@ -16,7 +16,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 <ia32/mmustructs.h> #include <arch/x86/mmustructs.h>
#include <sys/printk.h> #include <sys/printk.h>
/* forward declaration */ /* forward declaration */

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 <ia32/mmustructs.h> #include <arch/x86/mmustructs.h>
#include <linker/linker-defs.h> #include <linker/linker-defs.h>
#include <kernel_internal.h> #include <kernel_internal.h>
#include <kernel_structs.h> #include <kernel_structs.h>

View file

@ -24,7 +24,7 @@
/* list of headers that define whose structure offsets will be generated */ /* list of headers that define whose structure offsets will be generated */
#include <ia32/mmustructs.h> #include <arch/x86/mmustructs.h>
#include <kernel_offsets.h> #include <kernel_offsets.h>

View file

@ -43,7 +43,7 @@
#ifndef _ASMLANGUAGE #ifndef _ASMLANGUAGE
#include <stdint.h> #include <stdint.h>
#include <ia32/mmustructs.h> #include <arch/x86/mmustructs.h>
/* /*
* The following structure defines the set of 'non-volatile' integer registers. * The following structure defines the set of 'non-volatile' integer registers.

View file

@ -17,7 +17,7 @@
#include "sys_io.h" #include "sys_io.h"
#include <drivers/interrupt_controller/sysapic.h> #include <drivers/interrupt_controller/sysapic.h>
#include <kernel_arch_thread.h> #include <kernel_arch_thread.h>
#include <ia32/mmustructs.h> #include <arch/x86/mmustructs.h>
#include <stdbool.h> #include <stdbool.h>
#include <arch/common/ffs.h> #include <arch/common/ffs.h>
#include <misc/util.h> #include <misc/util.h>

View file

@ -5,8 +5,8 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#ifndef ZEPHYR_ARCH_X86_INCLUDE_IA32_MMUSTRUCTS_H_ #ifndef ZEPHYR_INCLUDE_ARCH_X86_MMUSTRUCTS_H_
#define ZEPHYR_ARCH_X86_INCLUDE_IA32_MMUSTRUCTS_H_ #define ZEPHYR_INCLUDE_ARCH_X86_MMUSTRUCTS_H_
#define MMU_PAGE_SIZE 4096U #define MMU_PAGE_SIZE 4096U
#define MMU_PAGE_MASK 0xfffU #define MMU_PAGE_MASK 0xfffU
@ -562,4 +562,4 @@ int z_x86_mmu_validate(struct x86_page_tables *ptables, void *addr, size_t size,
bool write); bool write);
#endif /* _ASMLANGUAGE */ #endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_ARCH_X86_INCLUDE_IA32_MMUSTRUCTS_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_X86_MMUSTRUCTS_H_ */

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 <ia32/mmustructs.h> #include <arch/x86/mmustructs.h>
#include <linker/linker-defs.h> #include <linker/linker-defs.h>
#ifdef CONFIG_X86_MMU #ifdef CONFIG_X86_MMU

View file

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

View file

@ -6,7 +6,7 @@
#include <zephyr.h> #include <zephyr.h>
#include <sys/printk.h> #include <sys/printk.h>
#include <ia32/mmustructs.h> #include <arch/x86/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>