Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
505队
OSKernel2024-chaos
Commits
cef4e4d0
Commit
cef4e4d0
authored
10 months ago
by
陈宽宽
Browse files
Options
Download
Patches
Plain Diff
fix: fix merge errors
parent
1d07f762
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
os/Cargo.lock
+44
-11
os/Cargo.lock
os/src/drivers/block/virtio_blk.rs
+14
-27
os/src/drivers/block/virtio_blk.rs
os/src/fs/ext4/inode.rs
+15
-12
os/src/fs/ext4/inode.rs
os/src/fs/fat32/inode.rs
+0
-4
os/src/fs/fat32/inode.rs
os/src/fs/file.rs
+4
-1
os/src/fs/file.rs
os/src/mm/address.rs
+0
-2
os/src/mm/address.rs
os/src/mm/memory_set.rs
+0
-1
os/src/mm/memory_set.rs
os/src/mm/page_table.rs
+0
-4
os/src/mm/page_table.rs
os/src/syscall/fs.rs
+20
-18
os/src/syscall/fs.rs
os/src/syscall/process.rs
+9
-55
os/src/syscall/process.rs
os/src/syscall/thread.rs
+0
-2
os/src/syscall/thread.rs
os/src/task/context.rs
+0
-1
os/src/task/context.rs
os/src/task/manager.rs
+8
-2
os/src/task/manager.rs
os/src/task/mod.rs
+11
-12
os/src/task/mod.rs
os/src/task/processor.rs
+0
-3
os/src/task/processor.rs
os/src/task/task.rs
+13
-13
os/src/task/task.rs
os/src/trap/mod.rs
+0
-20
os/src/trap/mod.rs
with
138 additions
and
188 deletions
+138
-188
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment