From 7c2d7d7b692e121738bf78b00d7dc55c1a64b233 Mon Sep 17 00:00:00 2001
From: "Charles E. Youse" <charles.youse@intel.com>
Date: Sat, 29 Jun 2019 11:00:39 -0700
Subject: [PATCH] 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>
---
 arch/x86/core/ia32/thread.c                                 | 2 +-
 arch/x86/core/ia32/x86_mmu.c                                | 2 +-
 arch/x86/core/offsets/offsets.c                             | 2 +-
 arch/x86/include/{ => ia32}/mmustructs.h                    | 6 +++---
 include/arch/x86/ia32/arch.h                                | 2 +-
 soc/x86/ia32/soc.c                                          | 2 +-
 soc/x86/intel_quark/quark_se/soc.c                          | 2 +-
 tests/kernel/boot_page_table/src/boot_page_table.c          | 2 +-
 .../mem_protect/x86_mmu_api/src/userbuffer_validate.c       | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename arch/x86/include/{ => ia32}/mmustructs.h (98%)

diff --git a/arch/x86/core/ia32/thread.c b/arch/x86/core/ia32/thread.c
index d5d92d9f9c5..32b831b9f48 100644
--- a/arch/x86/core/ia32/thread.c
+++ b/arch/x86/core/ia32/thread.c
@@ -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 */
diff --git a/arch/x86/core/ia32/x86_mmu.c b/arch/x86/core/ia32/x86_mmu.c
index e761c188b02..26bf205028b 100644
--- a/arch/x86/core/ia32/x86_mmu.c
+++ b/arch/x86/core/ia32/x86_mmu.c
@@ -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>
diff --git a/arch/x86/core/offsets/offsets.c b/arch/x86/core/offsets/offsets.c
index 3c06b0e202a..ff5ab4ede68 100644
--- a/arch/x86/core/offsets/offsets.c
+++ b/arch/x86/core/offsets/offsets.c
@@ -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>
diff --git a/arch/x86/include/mmustructs.h b/arch/x86/include/ia32/mmustructs.h
similarity index 98%
rename from arch/x86/include/mmustructs.h
rename to arch/x86/include/ia32/mmustructs.h
index 8722036d4d5..00994413752 100644
--- a/arch/x86/include/mmustructs.h
+++ b/arch/x86/include/ia32/mmustructs.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_ */
diff --git a/include/arch/x86/ia32/arch.h b/include/arch/x86/ia32/arch.h
index c3582408875..cfed679f6e8 100644
--- a/include/arch/x86/ia32/arch.h
+++ b/include/arch/x86/ia32/arch.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>
 
diff --git a/soc/x86/ia32/soc.c b/soc/x86/ia32/soc.c
index b03eff64c1b..2e926a92e31 100644
--- a/soc/x86/ia32/soc.c
+++ b/soc/x86/ia32/soc.c
@@ -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
diff --git a/soc/x86/intel_quark/quark_se/soc.c b/soc/x86/intel_quark/quark_se/soc.c
index ff61ad61bc6..8d2f6623aab 100644
--- a/soc/x86/intel_quark/quark_se/soc.c
+++ b/soc/x86/intel_quark/quark_se/soc.c
@@ -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>
diff --git a/tests/kernel/boot_page_table/src/boot_page_table.c b/tests/kernel/boot_page_table/src/boot_page_table.c
index 00082b2d279..f59b88771dd 100644
--- a/tests/kernel/boot_page_table/src/boot_page_table.c
+++ b/tests/kernel/boot_page_table/src/boot_page_table.c
@@ -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"
 
diff --git a/tests/kernel/mem_protect/x86_mmu_api/src/userbuffer_validate.c b/tests/kernel/mem_protect/x86_mmu_api/src/userbuffer_validate.c
index 4f6639fdaf7..5791419ea56 100644
--- a/tests/kernel/mem_protect/x86_mmu_api/src/userbuffer_validate.c
+++ b/tests/kernel/mem_protect/x86_mmu_api/src/userbuffer_validate.c
@@ -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>