From 976575c12b5da66996a3204ec711e4937a3ef240 Mon Sep 17 00:00:00 2001
From: Alexey Gavrilov <rebovas@yahoo.com>
Date: Thu, 22 Feb 2024 15:21:36 +0700
Subject: Some updates

---
 arch/x86/cpuinfo/CpuInfo.s    | 21 ---------------------
 arch/x86/cpuinfo/CpuidCheck.s | 21 +++++++++++++++++++++
 arch/x86/cpuinfo/Cpuinfo.cpp  |  1 -
 3 files changed, 21 insertions(+), 22 deletions(-)
 delete mode 100644 arch/x86/cpuinfo/CpuInfo.s
 create mode 100644 arch/x86/cpuinfo/CpuidCheck.s

(limited to 'arch/x86/cpuinfo')

diff --git a/arch/x86/cpuinfo/CpuInfo.s b/arch/x86/cpuinfo/CpuInfo.s
deleted file mode 100644
index 67bc9eb..0000000
--- a/arch/x86/cpuinfo/CpuInfo.s
+++ /dev/null
@@ -1,21 +0,0 @@
-global CPUIDCHK:function
-CPUIDCHK:
-    push ebx
-    pushfd
-    pop eax
-    mov ebx, eax
-    xor eax, 0x200000
-    push eax
-    popfd
-    pushfd
-    pop eax
-    xor eax, ebx
-    je nocpuid
-    mov eax, 1
-    jmp restore
-nocpuid:
-    mov eax, 0
-restore: 
-    pop ebx
-    ret
-.endchk: 
diff --git a/arch/x86/cpuinfo/CpuidCheck.s b/arch/x86/cpuinfo/CpuidCheck.s
new file mode 100644
index 0000000..67bc9eb
--- /dev/null
+++ b/arch/x86/cpuinfo/CpuidCheck.s
@@ -0,0 +1,21 @@
+global CPUIDCHK:function
+CPUIDCHK:
+    push ebx
+    pushfd
+    pop eax
+    mov ebx, eax
+    xor eax, 0x200000
+    push eax
+    popfd
+    pushfd
+    pop eax
+    xor eax, ebx
+    je nocpuid
+    mov eax, 1
+    jmp restore
+nocpuid:
+    mov eax, 0
+restore: 
+    pop ebx
+    ret
+.endchk: 
diff --git a/arch/x86/cpuinfo/Cpuinfo.cpp b/arch/x86/cpuinfo/Cpuinfo.cpp
index 682f68b..c6c551e 100644
--- a/arch/x86/cpuinfo/Cpuinfo.cpp
+++ b/arch/x86/cpuinfo/Cpuinfo.cpp
@@ -1,5 +1,4 @@
 #include "Cpuinfo.h"
-#include "../../../kernel/GlobalConstruct.h"
 
 
 inline Cpuinfo::cpuidFunctionIndex operator++(Cpuinfo::cpuidFunctionIndex& command)
-- 
cgit v1.2.3