From 9930957be3308d1d67c051461516113243d269da Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Thu, 24 Dec 2020 13:34:22 +0100
Subject: [PATCH] Renamed syscall() to syscall_op() in order to avoid a
 conflict when compiling for Linux.

---
 src/cpu/386_common.c  | 2 +-
 src/cpu/cpu.h         | 2 +-
 src/cpu/x86_ops_amd.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cpu/386_common.c b/src/cpu/386_common.c
index a62ac4f04..5ae3304bf 100644
--- a/src/cpu/386_common.c
+++ b/src/cpu/386_common.c
@@ -1760,7 +1760,7 @@ sysexit(uint32_t fetchdat)
 
 
 int
-syscall(uint32_t fetchdat)
+syscall_op(uint32_t fetchdat)
 {
 #ifdef ENABLE_386_COMMON_LOG
     x386_common_log("SYSCALL called\n");
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index 6e13695ab..43413f5ce 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -578,7 +578,7 @@ extern void	update_tsc(void);
 
 extern int	sysenter(uint32_t fetchdat);
 extern int	sysexit(uint32_t fetchdat);
-extern int	syscall(uint32_t fetchdat);
+extern int	syscall_op(uint32_t fetchdat);
 extern int	sysret(uint32_t fetchdat);
 
 extern cpu_family_t *cpu_get_family(const char *internal_name);
diff --git a/src/cpu/x86_ops_amd.h b/src/cpu/x86_ops_amd.h
index 439cb2a43..0674c8187 100644
--- a/src/cpu/x86_ops_amd.h
+++ b/src/cpu/x86_ops_amd.h
@@ -20,7 +20,7 @@ opSYSCALL(uint32_t fetchdat)
 
     ILLEGAL_ON(!(amd_efer & 0x0000000000000001));
 
-    ret = syscall(fetchdat);
+    ret = syscall_op(fetchdat);
 
     if (ret <= 1) {
 	CLOCK_CYCLES(20);