Merge branch 'BUPT-OS:main' into control_fix

BUPT-OS · Feb 3, 2024 · 96f1564 · 96f1564
2 parents c105d48 + 8368c16
commit 96f1564
Show file tree

Hide file tree

Showing 96 changed files with 3,190 additions and 1,763 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -243,6 +243,9 @@ jobs:
           echo 'obj-m	+= rust_module_parameters_loadable_default.o' >> samples/rust/Makefile
           echo 'obj-m	+= rust_module_parameters_loadable_custom.o'  >> samples/rust/Makefile
 
+      # Pre-check
+      - run: make LLVM=1 rustfmtcheck
+
       # Build
       - run: mv .github/workflows/kernel-${{ matrix.arch }}-${{ matrix.config }}.config .config
 

diff --git a/drivers/android/process.rs b/drivers/android/process.rs
@@ -823,7 +823,7 @@ impl IoctlHandler for Process {
 }
 
 impl FileOpener<Ref<Context>> for Process {
-    fn open(ctx: &Ref<Context>, fileref: &File) -> Result<Self::Wrapper> {
+    fn open(ctx: &Ref<Context>, _fileref: &File) -> Result<Self::Wrapper> {
         Self::new(ctx.clone())
     }
 }

diff --git a/kernel/rros/arch/arm64/syscall.rs b/kernel/rros/arch/arm64/syscall.rs
@@ -1,6 +1,4 @@
-use kernel::bindings;
-use kernel::prelude::*;
-use kernel::ptrace::{IrqStage, PtRegs};
+use kernel::{bindings, prelude::*, ptrace::PtRegs};
 
 /// Returns the first register value from the given out-of-bounds pointer.
 #[macro_export]