diff options
Diffstat (limited to 'dev/Kernel/HALKit')
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/HalApplicationProcessor.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/Processor.h | 2 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/Storage/SATA-DMA.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/ARM64/HalKernelMain.cc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc b/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc index a1edf6f1..d875bd50 100644 --- a/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc +++ b/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc @@ -8,7 +8,7 @@ #include <HALKit/AMD64/Processor.h> #include <NewKit/KString.h> #include <ArchKit/ArchKit.h> -#include <KernelKit/Heap.h> +#include <KernelKit/MemoryMgr.h> namespace Kernel { diff --git a/dev/Kernel/HALKit/AMD64/HalApplicationProcessor.cc b/dev/Kernel/HALKit/AMD64/HalApplicationProcessor.cc index c6074d72..81479fc8 100644 --- a/dev/Kernel/HALKit/AMD64/HalApplicationProcessor.cc +++ b/dev/Kernel/HALKit/AMD64/HalApplicationProcessor.cc @@ -219,7 +219,7 @@ namespace Kernel::HAL kcout << "SMP: Starting APs...\r"; - UInt32 eax, edx; + UInt32 eax, edx; kApicBaseAddress = kMADTBlock->Address; while (Yes) diff --git a/dev/Kernel/HALKit/AMD64/Processor.h b/dev/Kernel/HALKit/AMD64/Processor.h index 623c8245..311d2738 100644 --- a/dev/Kernel/HALKit/AMD64/Processor.h +++ b/dev/Kernel/HALKit/AMD64/Processor.h @@ -242,7 +242,7 @@ namespace Kernel::HAL : "=a"(*lo), "=d"(*hi) : "c"(msr)); - return *lo + *hi; + return *lo + *hi; } /// @brief Set Model-specific register. diff --git a/dev/Kernel/HALKit/AMD64/Storage/SATA-DMA.cc b/dev/Kernel/HALKit/AMD64/Storage/SATA-DMA.cc index 94875560..767f83e5 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/SATA-DMA.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/SATA-DMA.cc @@ -17,7 +17,7 @@ #include "HALKit/AMD64/Processor.h" #include "KernelKit/DebugOutput.h" -#include "KernelKit/Heap.h" +#include "KernelKit/MemoryMgr.h" #include "NewKit/Defines.h" #include <KernelKit/UserProcessScheduler.h> #include <KernelKit/LPC.h> diff --git a/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc b/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc index 69459f66..5dd79f1f 100644 --- a/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc +++ b/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc @@ -7,7 +7,7 @@ #include <Mod/ACPI/ACPIFactoryInterface.h> #include <NewKit/KString.h> #include <ArchKit/ArchKit.h> -#include <KernelKit/Heap.h> +#include <KernelKit/MemoryMgr.h> #include <Mod/APM/APM.h> namespace Kernel diff --git a/dev/Kernel/HALKit/ARM64/HalKernelMain.cc b/dev/Kernel/HALKit/ARM64/HalKernelMain.cc index 7756facd..a6d03e4b 100644 --- a/dev/Kernel/HALKit/ARM64/HalKernelMain.cc +++ b/dev/Kernel/HALKit/ARM64/HalKernelMain.cc @@ -8,7 +8,7 @@ #include <Mod/CoreGfx/FBMgr.h> #include <FirmwareKit/Handover.h> #include <KernelKit/FileMgr.h> -#include <KernelKit/Heap.h> +#include <KernelKit/MemoryMgr.h> #include <KernelKit/PEFCodeMgr.h> #include <KernelKit/UserProcessScheduler.h> #include <NewKit/Json.h> |