Merge branch 'updated_rustc_and_futex_fixes' into 'master'
Fixes for futex and newer rustc See merge request redox-os/kernel!209
This commit is contained in:
+1
-1
@@ -27,7 +27,7 @@ pub static mut IDTR: DescriptorTablePointer<X86IdtEntry> = DescriptorTablePointe
|
||||
pub type IdtEntries = [IdtEntry; 256];
|
||||
pub type IdtReservations = [AtomicU32; 8];
|
||||
|
||||
#[repr(packed)]
|
||||
#[repr(C)]
|
||||
pub struct Idt {
|
||||
entries: IdtEntries,
|
||||
reservations: IdtReservations,
|
||||
|
||||
@@ -27,7 +27,7 @@ pub static mut IDTR: DescriptorTablePointer<X86IdtEntry> = DescriptorTablePointe
|
||||
pub type IdtEntries = [IdtEntry; 256];
|
||||
pub type IdtReservations = [AtomicU64; 4];
|
||||
|
||||
#[repr(packed)]
|
||||
#[repr(C)]
|
||||
pub struct Idt {
|
||||
entries: IdtEntries,
|
||||
reservations: IdtReservations,
|
||||
|
||||
Reference in New Issue
Block a user