Skip to content
Permalink
Browse files

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

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>
  • Loading branch information...
Charles E. Youse authored and nashif committed Jun 27, 2019
1 parent dff016b commit 930e6af99951e5f12cd59a9ccf6f0531fae1f48b
@@ -18,7 +18,7 @@
#include <kernel_structs.h>
#include <sys/printk.h>
#include <arch/x86/irq_controller.h>
#include <arch/x86/segmentation.h>
#include <arch/x86/ia32/segmentation.h>
#include <exception.h>
#include <inttypes.h>
#include <exc_handle.h>
@@ -22,7 +22,7 @@
#include <irq.h>
#include <debug/tracing.h>
#include <kswap.h>
#include <arch/x86/segmentation.h>
#include <arch/x86/ia32/segmentation.h>

extern void z_SpuriousIntHandler(void *handler);
extern void z_SpuriousIntNoErrCodeHandler(void *handler);
@@ -26,7 +26,7 @@
#ifndef _ASMLANGUAGE
#include <arch/x86/asm_inline.h>
#include <arch/common/addr_types.h>
#include <arch/x86/segmentation.h>
#include <arch/x86/ia32/segmentation.h>
#endif

#ifdef __cplusplus
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/

#ifndef ZEPHYR_INCLUDE_ARCH_X86_SEGMENTATION_H_
#define ZEPHYR_INCLUDE_ARCH_X86_SEGMENTATION_H_
#ifndef ZEPHYR_INCLUDE_ARCH_X86_IA32_SEGMENTATION_H_
#define ZEPHYR_INCLUDE_ARCH_X86_IA32_SEGMENTATION_H_

#include <zephyr/types.h>

@@ -549,4 +549,4 @@ static inline u16_t _get_ds(void)
}
#endif

#endif /* ZEPHYR_INCLUDE_ARCH_X86_SEGMENTATION_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_X86_IA32_SEGMENTATION_H_ */
@@ -14,7 +14,7 @@
#include <zephyr.h>
#include <ztest.h>
#include <tc_util.h>
#include <arch/x86/segmentation.h>
#include <arch/x86/ia32/segmentation.h>

#include <kernel_structs.h>
#if defined(__GNUC__)

0 comments on commit 930e6af

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