Skip to content

Commit

Permalink
Merge branch 'stlankes-toolchain'
Browse files Browse the repository at this point in the history
  • Loading branch information
@stlankes
stlankes committed Apr 24, 2024
2 parents 32c9470 + 454d9a3 commit 0cee342
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion kernel
Submodule kernel updated 77 files
+53 −29 .github/workflows/ci.yml
+174 −112 Cargo.lock
+11 −8 Cargo.toml
+12 −0 hermit-macro/Cargo.toml
+22 −0 hermit-macro/src/lib.rs
+195 −0 hermit-macro/src/system.rs
+1 −1 rust-toolchain.toml
+1 −1 src/arch/aarch64/kernel/interrupts.rs
+1 −1 src/arch/aarch64/kernel/mod.rs
+4 −4 src/arch/aarch64/kernel/pci.rs
+1 −1 src/arch/aarch64/kernel/processor.rs
+3 −3 src/arch/aarch64/kernel/scheduler.rs
+1 −1 src/arch/aarch64/kernel/serial.rs
+2 −2 src/arch/aarch64/kernel/switch.rs
+1 −1 src/arch/aarch64/kernel/systemtime.rs
+2 −2 src/arch/aarch64/mm/paging.rs
+1 −1 src/arch/riscv64/kernel/core_local.rs
+2 −2 src/arch/riscv64/kernel/mod.rs
+7 −4 src/arch/riscv64/kernel/processor.rs
+1 −1 src/arch/riscv64/kernel/scheduler.rs
+1 −3 src/arch/riscv64/kernel/systemtime.rs
+1 −1 src/arch/riscv64/mm/paging.rs
+13 −15 src/arch/x86_64/kernel/acpi.rs
+20 −13 src/arch/x86_64/kernel/apic.rs
+6 −6 src/arch/x86_64/kernel/gdt.rs
+2 −2 src/arch/x86_64/kernel/interrupts.rs
+2 −2 src/arch/x86_64/kernel/mmio.rs
+10 −12 src/arch/x86_64/kernel/mod.rs
+0 −2 src/arch/x86_64/kernel/pci.rs
+2 −2 src/arch/x86_64/kernel/pic.rs
+24 −34 src/arch/x86_64/kernel/processor.rs
+3 −3 src/arch/x86_64/kernel/scheduler.rs
+1 −1 src/arch/x86_64/kernel/serial.rs
+2 −2 src/arch/x86_64/kernel/switch.rs
+2 −9 src/arch/x86_64/kernel/systemtime.rs
+8 −6 src/arch/x86_64/mm/paging.rs
+2 −5 src/arch/x86_64/mm/physicalmem.rs
+4 −1 src/arch/x86_64/mod.rs
+1 −1 src/drivers/net/virtio_mmio.rs
+1 −1 src/drivers/virtio/transport/mmio.rs
+80 −44 src/drivers/virtio/transport/pci.rs
+2 −2 src/drivers/virtio/virtqueue/mod.rs
+44 −63 src/drivers/virtio/virtqueue/packed.rs
+39 −37 src/drivers/virtio/virtqueue/split.rs
+6 −2 src/errno.rs
+223 −37 src/fs/fuse.rs
+1 −1 src/fs/uhyve.rs
+14 −132 src/lib.rs
+79 −8 src/macros.rs
+11 −5 src/mm/allocator.rs
+7 −2 src/mm/mod.rs
+6 −6 src/scheduler/mod.rs
+1 −1 src/scheduler/task.rs
+1 −1 src/shell.rs
+19 −39 src/syscalls/condvar.rs
+14 −20 src/syscalls/entropy.rs
+4 −17 src/syscalls/futex.rs
+2 −2 src/syscalls/interfaces/uhyve.rs
+10 −33 src/syscalls/lwip.rs
+175 −137 src/syscalls/mod.rs
+4 −12 src/syscalls/processor.rs
+8 −24 src/syscalls/recmutex.rs
+20 −40 src/syscalls/semaphore.rs
+53 −136 src/syscalls/socket.rs
+22 −48 src/syscalls/spinlock.rs
+2 −8 src/syscalls/system.rs
+62 −142 src/syscalls/tasks.rs
+14 −48 src/syscalls/timer.rs
+15 −13 tests/thread.rs
+4 −25 xtask/src/archive.rs
+22 −0 xtask/src/binutil.rs
+11 −4 xtask/src/build.rs
+22 −26 xtask/src/cargo_build.rs
+48 −7 xtask/src/ci/build.rs
+78 −17 xtask/src/ci/qemu.rs
+4 −0 xtask/src/ci/rftrace.snap
+2 −0 xtask/src/main.rs
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "nightly-2024-03-01"
channel = "nightly-2024-04-15"
components = [ "rust-src" ]

0 comments on commit 0cee342

Please sign in to comment.