michaelh/zephyr
1
0
Fork 0
Code Releases Activity

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

Browse source 
This header is currently IA32-specific, so move it into the subarch
directory and update references to it.

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
This commit is contained in:
Charles E. Youse 2019-06-27 15:32:20 -07:00 • committed by Anas Nashif
commit 930e6af999
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,7 @@
#include <kernel_structs.h> #include <kernel_structs.h>
#include <sys/printk.h> #include <sys/printk.h>
#include <arch/x86/irq_controller.h> #include <arch/x86/irq_controller.h>
#include <arch/x86/segmentation.h> #include <arch/x86/ia32/segmentation.h>
#include <exception.h> #include <exception.h>
#include <inttypes.h> #include <inttypes.h>
#include <exc_handle.h> #include <exc_handle.h>

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

@ -22,7 +22,7 @@
#include <irq.h> #include <irq.h>
#include <debug/tracing.h> #include <debug/tracing.h>
#include <kswap.h> #include <kswap.h>
#include <arch/x86/segmentation.h> #include <arch/x86/ia32/segmentation.h>
extern void z_SpuriousIntHandler(void *handler); extern void z_SpuriousIntHandler(void *handler);
extern void z_SpuriousIntNoErrCodeHandler(void *handler); extern void z_SpuriousIntNoErrCodeHandler(void *handler);

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

@ -26,7 +26,7 @@
#ifndef _ASMLANGUAGE #ifndef _ASMLANGUAGE
#include <arch/x86/asm_inline.h> #include <arch/x86/asm_inline.h>
#include <arch/common/addr_types.h> #include <arch/common/addr_types.h>
#include <arch/x86/segmentation.h> #include <arch/x86/ia32/segmentation.h>
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

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

@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#ifndef ZEPHYR_INCLUDE_ARCH_X86_SEGMENTATION_H_ #ifndef ZEPHYR_INCLUDE_ARCH_X86_IA32_SEGMENTATION_H_
#define ZEPHYR_INCLUDE_ARCH_X86_SEGMENTATION_H_ #define ZEPHYR_INCLUDE_ARCH_X86_IA32_SEGMENTATION_H_
#include <zephyr/types.h> #include <zephyr/types.h>
@ -549,4 +549,4 @@ static inline u16_t _get_ds(void)
} }
#endif #endif
#endif /* ZEPHYR_INCLUDE_ARCH_X86_SEGMENTATION_H_ */ #endif /* ZEPHYR_INCLUDE_ARCH_X86_IA32_SEGMENTATION_H_ */

2
tests/kernel/static_idt/src/main.c
View file

@ -14,7 +14,7 @@
#include <zephyr.h> #include <zephyr.h>
#include <ztest.h> #include <ztest.h>
#include <tc_util.h> #include <tc_util.h>
#include <arch/x86/segmentation.h> #include <arch/x86/ia32/segmentation.h>
#include <kernel_structs.h> #include <kernel_structs.h>
#if defined(__GNUC__) #if defined(__GNUC__)