Skip to content
Permalink
Browse files

arch/x86: move arch/x86/syscall.h to arch/x86/ia32/syscall.h

This file is currently IA32-specific, so it is moved and the
reference to it at the arch-independent layer is moved.

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 6f3009e commit c4175e910698e50c9fe5d39d6ef0a4b4b3bed88d
Showing with 6 additions and 6 deletions.
  1. +2 −2 include/arch/syscall.h
  2. +4 −4 include/arch/x86/{ → ia32}/syscall.h
@@ -9,8 +9,8 @@
#ifndef ZEPHYR_INCLUDE_ARCH_SYSCALL_H_
#define ZEPHYR_INCLUDE_ARCH_SYSCALL_H_

#if defined(CONFIG_X86)
#include <arch/x86/syscall.h>
#if defined(CONFIG_X86) && !defined(CONFIG_X86_LONGMODE)
#include <arch/x86/ia32/syscall.h>
#elif defined(CONFIG_ARM)
#include <arch/arm/syscall.h>
#elif defined(CONFIG_ARC)
@@ -6,15 +6,15 @@

/**
* @file
* @brief x86 specific sycall header
* @brief x86 (IA32) specific sycall header
*
* This header contains the x86 specific sycall interface. It is
* included by the syscall interface architecture-abstraction header
* (include/arch/syscall.h)
*/

#ifndef ZEPHYR_INCLUDE_ARCH_X86_SYSCALL_H_
#define ZEPHYR_INCLUDE_ARCH_X86_SYSCALL_H_
#ifndef ZEPHYR_INCLUDE_ARCH_X86_IA32_SYSCALL_H_
#define ZEPHYR_INCLUDE_ARCH_X86_IA32_SYSCALL_H_

#define USER_CODE_SEG 0x2b /* at dpl=3 */
#define USER_DATA_SEG 0x33 /* at dpl=3 */
@@ -169,4 +169,4 @@ static inline bool z_arch_is_user_context(void)

#endif /* _ASMLANGUAGE */
#endif /* CONFIG_USERSPACE */
#endif /* ZEPHYR_INCLUDE_ARCH_X86_SYSCALL_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_X86_IA32_SYSCALL_H_ */

0 comments on commit c4175e9

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