diff options
| author | Andreas Kling <kling@serenityos.org> | 2020-05-16 12:00:04 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-05-16 12:00:04 +0200 |
| commit | 21d5f4ada1a38cc90ff78a18d141e6477ccef333 (patch) | |
| tree | 28cff77ef0ceb49a87ec973b30d76dc0628a1361 /AK/Memory.h | |
| parent | c12cfdea8799b24d2a8c57131e8563ce3dfd66cf (diff) | |
| download | serenity-21d5f4ada1a38cc90ff78a18d141e6477ccef333.zip | |
Kernel: Absorb LibBareMetal back into the kernel
This was supposed to be the foundation for some kind of pre-kernel
environment, but nobody is working on it right now, so let's move
everything back into the kernel and remove all the confusion.
Diffstat (limited to 'AK/Memory.h')
| -rw-r--r-- | AK/Memory.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/AK/Memory.h b/AK/Memory.h index 4d055ebe96..7bdd294099 100644 --- a/AK/Memory.h +++ b/AK/Memory.h @@ -28,20 +28,20 @@ #include <AK/Types.h> -#if defined(KERNEL) || defined(BOOTSTRAPPER) -# include <LibBareMetal/StdLib.h> +#if defined(KERNEL) +# include <Kernel/StdLib.h> #else # include <stdlib.h> # include <string.h> #endif -#if defined(__serenity__) && !defined(KERNEL) && !defined(BOOTSTRAPPER) +#if defined(__serenity__) && !defined(KERNEL) extern "C" void* mmx_memcpy(void* to, const void* from, size_t); #endif ALWAYS_INLINE void fast_u32_copy(u32* dest, const u32* src, size_t count) { -#if defined(__serenity__) && !defined(KERNEL) && !defined(BOOTSTRAPPER) +#if defined(__serenity__) && !defined(KERNEL) if (count >= 256) { mmx_memcpy(dest, src, count * sizeof(count)); return; |