aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2019-02-04 12:16:57 -0800
committerH. Peter Anvin <hpa@zytor.com>2019-02-04 12:16:57 -0800
commit35badfce1f4855a32d089e1a9d8c098e3ef343c7 (patch)
treeb114358b6bac8eb97d7b3bf395e7eaeb7a1de1e5 /core
parent621770d33e6da95556ccfc4f08fd16edb8300c63 (diff)
downloadsyslinux-35badfce1f4855a32d089e1a9d8c098e3ef343c7.tar.gz
syslinux-35badfce1f4855a32d089e1a9d8c098e3ef343c7.tar.xz
syslinux-35badfce1f4855a32d089e1a9d8c098e3ef343c7.zip
Reorganize and clean up a bunch of the x86 code
We were doing a bunch of i386-specific things even on x86-64. Fix this, and merge x86 definitions where possible. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core')
-rw-r--r--core/conio.c2
-rw-r--r--core/dmi.c2
-rw-r--r--core/elflink/load_env32.c2
-rw-r--r--core/fs/pxe/dhcp_option.c2
-rw-r--r--core/fs/pxe/ftp.c2
-rw-r--r--core/fs/pxe/idle.c2
-rw-r--r--core/fs/pxe/isr.c2
-rw-r--r--core/fs/pxe/pxe.c2
-rw-r--r--core/idle.c2
-rw-r--r--core/include/thread.h2
-rw-r--r--core/legacynet/idle.c2
-rw-r--r--core/localboot.c2
-rw-r--r--core/thread/idle_thread.c2
-rw-r--r--core/thread/schedule.c2
-rw-r--r--core/thread/semaphore.c2
15 files changed, 15 insertions, 15 deletions
diff --git a/core/conio.c b/core/conio.c
index 427228ea..e5e0ca76 100644
--- a/core/conio.c
+++ b/core/conio.c
@@ -26,7 +26,7 @@
#include <string.h>
#include <fs.h>
#include <com32.h>
-#include <sys/cpu.h>
+#include <x86/cpu.h>
#include <syslinux/firmware.h>
#include "bios.h"
diff --git a/core/dmi.c b/core/dmi.c
index 9cbe2832..550b63e2 100644
--- a/core/dmi.c
+++ b/core/dmi.c
@@ -32,7 +32,7 @@
#include <string.h>
#include <stdio.h>
#include <sys/bitops.h>
-#include <sys/cpu.h>
+#include <x86/cpu.h>
#include <syslinux/sysappend.h>
#include "core.h"
diff --git a/core/elflink/load_env32.c b/core/elflink/load_env32.c
index db19c7aa..3d54a8b7 100644
--- a/core/elflink/load_env32.c
+++ b/core/elflink/load_env32.c
@@ -10,7 +10,7 @@
#include <setjmp.h>
#include <linux/list.h>
#include <netinet/in.h>
-#include <sys/cpu.h>
+#include <x86/cpu.h>
#include <core.h>
#include <fcntl.h>
#include <sys/file.h>
diff --git a/core/fs/pxe/dhcp_option.c b/core/fs/pxe/dhcp_option.c
index 17f8034f..1b8ec9d8 100644
--- a/core/fs/pxe/dhcp_option.c
+++ b/core/fs/pxe/dhcp_option.c
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <string.h>
#include <core.h>
-#include <sys/cpu.h>
+#include <x86/cpu.h>
#include <lwip/opt.h> /* DNS_MAX_SERVERS */
#include <dprintf.h>
#include "pxe.h"
diff --git a/core/fs/pxe/ftp.c b/core/fs/pxe/ftp.c
index 4327e45c..947f2899 100644
--- a/core/fs/pxe/ftp.c
+++ b/core/fs/pxe/ftp.c
@@ -18,7 +18,7 @@
#include <string.h>
#include <fcntl.h>
#include <minmax.h>
-#include <sys/cpu.h>
+#include <x86/cpu.h>
#include <netinet/in.h>
#include <lwip/api.h>
#include "core.h"
diff --git a/core/fs/pxe/idle.c b/core/fs/pxe/idle.c
index 1d1bb8bc..dbc5b9ab 100644
--- a/core/fs/pxe/idle.c
+++ b/core/fs/pxe/idle.c
@@ -16,7 +16,7 @@
#include <core.h>
#include <fs.h>
#include <minmax.h>
-#include <sys/cpu.h>
+#include <x86/cpu.h>
#include "pxe.h"
void pxe_idle_init(void)
diff --git a/core/fs/pxe/isr.c b/core/fs/pxe/isr.c
index 7da0cc73..1fc9c3f2 100644
--- a/core/fs/pxe/isr.c
+++ b/core/fs/pxe/isr.c
@@ -9,7 +9,7 @@
#include "thread.h"
#include "pxe.h"
#include <string.h>
-#include <sys/cpu.h>
+#include <x86/cpu.h>
#include <sys/io.h>
extern uint8_t pxe_irq_pending;
diff --git a/core/fs/pxe/pxe.c b/core/fs/pxe/pxe.c
index 761a1715..685fcc8f 100644
--- a/core/fs/pxe/pxe.c
+++ b/core/fs/pxe/pxe.c
@@ -4,7 +4,7 @@
#include <core.h>
#include <fs.h>
#include <fcntl.h>
-#include <sys/cpu.h>
+#include <x86/cpu.h>
#include "pxe.h"
#include "thread.h"
#include "url.h"
diff --git a/core/idle.c b/core/idle.c
index c8050554..27cdfc6f 100644
--- a/core/idle.c
+++ b/core/idle.c
@@ -20,7 +20,7 @@
*/
#include "core.h"
-#include <sys/cpu.h>
+#include <x86/cpu.h>
#define TICKS_TO_IDLE 4 /* Also in idle.inc */
diff --git a/core/include/thread.h b/core/include/thread.h
index 8ec4a267..72ebba30 100644
--- a/core/include/thread.h
+++ b/core/include/thread.h
@@ -6,7 +6,7 @@
#include <limits.h>
#include <stdbool.h>
#include <timer.h>
-#include <sys/cpu.h>
+#include <x86/cpu.h>
/* The idle thread runs at this priority */
#define IDLE_THREAD_PRIORITY INT_MAX
diff --git a/core/legacynet/idle.c b/core/legacynet/idle.c
index e0892379..5a94166d 100644
--- a/core/legacynet/idle.c
+++ b/core/legacynet/idle.c
@@ -16,7 +16,7 @@
#include <core.h>
#include <fs.h>
#include <minmax.h>
-#include <sys/cpu.h>
+#include <x86/cpu.h>
#include "pxe.h"
static int pxe_idle_poll(void)
diff --git a/core/localboot.c b/core/localboot.c
index 0b8769e4..c5fb9eca 100644
--- a/core/localboot.c
+++ b/core/localboot.c
@@ -10,7 +10,7 @@
*
* -----------------------------------------------------------------------
*/
-#include <sys/cpu.h>
+#include <x86/cpu.h>
#include <sys/io.h>
#include <string.h>
#include <core.h>
diff --git a/core/thread/idle_thread.c b/core/thread/idle_thread.c
index 8faa0719..f709531b 100644
--- a/core/thread/idle_thread.c
+++ b/core/thread/idle_thread.c
@@ -1,6 +1,6 @@
#include "thread.h"
#include <limits.h>
-#include <sys/cpu.h>
+#include <x86/cpu.h>
static void default_idle_thread_hook(void)
{
diff --git a/core/thread/schedule.c b/core/thread/schedule.c
index 31a2840d..4f0dfe37 100644
--- a/core/thread/schedule.c
+++ b/core/thread/schedule.c
@@ -1,5 +1,5 @@
#include <klibc/compiler.h>
-#include <sys/cpu.h>
+#include <x86/cpu.h>
#include "thread.h"
#include "core.h"
#include <dprintf.h>
diff --git a/core/thread/semaphore.c b/core/thread/semaphore.c
index c99af9c5..b85bc1e3 100644
--- a/core/thread/semaphore.c
+++ b/core/thread/semaphore.c
@@ -1,4 +1,4 @@
-#include <sys/cpu.h>
+#include <x86/cpu.h>
#include "thread.h"
void sem_init(struct semaphore *sem, int count)