diff --git a/arch/x86/include/ia32/kernel_arch_data.h b/arch/x86/include/ia32/kernel_arch_data.h
index f22aaa250e0..7001aada158 100644
--- a/arch/x86/include/ia32/kernel_arch_data.h
+++ b/arch/x86/include/ia32/kernel_arch_data.h
@@ -68,17 +68,6 @@
 #define _FP_USER_MASK (K_FP_REGS)
 #endif
 
-/*
- * EFLAGS value to utilize for the initial context: IF=1.
- */
-
-#define EFLAGS_INITIAL 0x00000200U
-
-/* Enable paging and write protection */
-#define CR0_PG_WP_ENABLE 0x80010000
-/* Set the 5th bit in  CR4 */
-#define CR4_PAE_ENABLE 0x00000020
-
 #ifndef _ASMLANGUAGE
 
 #include <sys/util.h>
diff --git a/arch/x86/include/intel64/kernel_arch_data.h b/arch/x86/include/intel64/kernel_arch_data.h
new file mode 100644
index 00000000000..4cc3275cd19
--- /dev/null
+++ b/arch/x86/include/intel64/kernel_arch_data.h
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2019 Intel Corp.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef ZEPHYR_ARCH_X86_INCLUDE_INTEL64_KERNEL_ARCH_DATA_H_
+#define ZEPHYR_ARCH_X86_INCLUDE_INTEL64_KERNEL_ARCH_DATA_H_
+
+#endif /* ZEPHYR_ARCH_X86_INCLUDE_INTEL64_KERNEL_ARCH_DATA_H_ */
diff --git a/arch/x86/include/kernel_arch_data.h b/arch/x86/include/kernel_arch_data.h
index ce5da741033..acd317af66b 100644
--- a/arch/x86/include/kernel_arch_data.h
+++ b/arch/x86/include/kernel_arch_data.h
@@ -33,7 +33,24 @@
 #define IV_SIMD_FP 19
 #define IV_INTEL_RESERVED_END 31
 
-#ifndef CONFIG_X86_LONGMODE
+/*
+ * EFLAGS/RFLAGS definitions. (RFLAGS is just zero-extended EFLAGS.)
+ */
+
+#define EFLAGS_IF	0x00000200U	/* interrupts enabled */
+#define EFLAGS_INITIAL	(EFLAGS_IF)
+
+/*
+ * Control register definitions.
+ */
+
+#define CR0_PG		0x80000000	/* enable paging */
+#define CR0_WP		0x00010000	/* honor W bit even when supervisor */
+#define CR4_PAE		0x00000020	/* enable PAE */
+
+#ifdef CONFIG_X86_LONGMODE
+#include <intel64/kernel_arch_data.h>
+#else
 #include <ia32/kernel_arch_data.h>
 #endif