Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kernel: return correct time used #2059

Merged
merged 1 commit into from
Jul 31, 2020
Merged

kernel: return correct time used #2059

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion kernel/src/sched.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ impl Kernel {
// so we protect against that by checking for the expiration here. Checking
// the return reason is insufficient because it is possible for the timer to expire
// after the process has returned to the kernel but before these lines are reached.
Some(0)
Some(timeslice)
} else {
Some(timeslice - remaining)
}
Expand Down