Aufgrund einer Wartung wird GitLab am 19.10. zwischen 8:00 und 9:00 Uhr kurzzeitig nicht zur Verfügung stehen. / Due to maintenance, GitLab will be temporarily unavailable on 19.10. between 8:00 and 9:00 am.

Unverified Commit 6605efce authored by bors[bot]'s avatar bors[bot] Committed by GitHub
Browse files

Merge #39

39: Migrate from core-intrinsics to core::ptr r=mkroening a=mkroening

bors r+
Co-authored-by: Martin Kröning's avatarMartin Kröning <>
parents 7bdadcc6 c389741e
Pipeline #554606 passed with stages
in 2 minutes and 51 seconds
......@@ -14,7 +14,7 @@ pub use self::bootinfo::*;
use crate::arch::x86_64::paging::{BasePageSize, LargePageSize, PageSize, PageTableEntryFlags};
use crate::arch::x86_64::serial::SerialPort;
use core::convert::TryInto;
use core::intrinsics::copy;
use core::ptr::copy;
use core::{mem, slice};
use goblin::elf;
use multiboot::information::{MemoryManagement, Multiboot, PAddr};
......@@ -24,8 +24,7 @@ extern crate bitflags;
use crate::arch::x86_64::paging::{LargePageSize, PageSize};
use crate::arch::{get_memory, BOOT_INFO, ELF_ARCH};
use core::convert::TryInto;
use core::intrinsics::{copy_nonoverlapping, write_bytes};
use core::ptr;
use core::ptr::{self, copy_nonoverlapping, write_bytes};
use goblin::elf;
use goblin::elf::program_header::{PT_LOAD, PT_TLS};
use goblin::elf64::reloc::*;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment